From b025915a31c128e54e292e0a66167aa6b72fa97d Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:09:54 +0000 Subject: [PATCH] Update configuration --- composer.lock | 209 +++++++----------- ...block.block.hdbt_subtheme_user_inquiry.yml | 40 ---- ...m_display.paragraph.event_list.default.yml | 9 +- ...form_display.tpr_unit.tpr_unit.default.yml | 40 ++-- ...view_display.tpr_unit.tpr_unit.default.yml | 28 +-- ..._compliance.cookie_category.statistics.yml | 4 +- conf/cmi/eu_cookie_compliance.settings.yml | 2 +- ..._compliance.cookie_category.statistics.yml | 2 +- ..._compliance.cookie_category.statistics.yml | 2 +- conf/cmi/metatag.metatag_defaults.global.yml | 4 +- .../cmi/metatag.metatag_defaults.tpr_unit.yml | 4 +- docker-compose.yml | 2 +- docker/openshift/crons/linked-events.sh | 10 + 13 files changed, 133 insertions(+), 223 deletions(-) delete mode 100644 conf/cmi/block.block.hdbt_subtheme_user_inquiry.yml create mode 100644 docker/openshift/crons/linked-events.sh diff --git a/composer.lock b/composer.lock index 5a5ca6269..ea8558507 100644 --- a/composer.lock +++ b/composer.lock @@ -2801,6 +2801,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" @@ -3626,23 +3630,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": "*" @@ -3650,8 +3652,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" @@ -3967,16 +3969,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": { @@ -3994,10 +3996,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", @@ -4086,16 +4088,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": { @@ -4124,10 +4126,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", @@ -4175,12 +4177,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": { @@ -4252,7 +4254,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", @@ -4290,16 +4292,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.20", + "version": "4.3.23", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "9d7def6814bf8a94f662f4fd983cb8fe5114ae03" + "reference": "8a8b129d2688bbef813059e80530b622335574c7" }, "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/8a8b129d2688bbef813059e80530b622335574c7", + "reference": "8a8b129d2688bbef813059e80530b622335574c7", "shasum": "" }, "require": { @@ -4409,10 +4411,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.23", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-03-12T08:04:15+00:00" + "time": "2024-03-18T09:07:03+00:00" }, { "name": "drupal/helfi_proxy", @@ -4901,59 +4903,6 @@ "source": "https://git.drupalcode.org/project/jquery_ui_datepicker" } }, - { - "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/jquery_ui_slider", "version": "2.0.0", @@ -5065,17 +5014,17 @@ }, { "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" @@ -5087,8 +5036,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" @@ -5395,29 +5344,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." @@ -8605,16 +8554,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": { @@ -8675,7 +8624,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": [ { @@ -8683,7 +8632,7 @@ "type": "github" } ], - "time": "2021-11-16T10:29:06+00:00" + "time": "2024-03-13T13:12:53+00:00" }, { "name": "league/flysystem", @@ -9539,16 +9488,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": { @@ -9579,7 +9528,7 @@ "./" ], "license": [ - "BSD-3-Clause" + "BSD-2-Clause" ], "authors": [ { @@ -9605,17 +9554,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", @@ -9674,12 +9613,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": { @@ -9692,9 +9631,9 @@ }, "type": "library", "autoload": { - "psr-0": { - "": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "include-path": [ @@ -9715,7 +9654,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", @@ -10484,16 +10423,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": { @@ -10557,9 +10496,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/block.block.hdbt_subtheme_user_inquiry.yml b/conf/cmi/block.block.hdbt_subtheme_user_inquiry.yml deleted file mode 100644 index 7671667d5..000000000 --- a/conf/cmi/block.block.hdbt_subtheme_user_inquiry.yml +++ /dev/null @@ -1,40 +0,0 @@ -uuid: 838fc8f2-cb91-4f54-b2b1-717b032da2b2 -langcode: en -status: true -dependencies: - module: - - helfi_platform_config - - language - - user - theme: - - hdbt_subtheme -id: hdbt_subtheme_user_inquiry -theme: hdbt_subtheme -region: attachments -weight: -19 -provider: helfi_platform_config -plugin: chat_leijuke -settings: - id: chat_leijuke - label: 'User inquiry' - label_display: '' - provider: helfi_platform_config - chat_title: '' - chat_selection: user_inquiry -visibility: - language: - id: language - negate: false - context_mapping: - language: '@language.current_language_context:language_interface' - langcodes: - fi: fi - en: en - sv: sv - user_role: - id: user_role - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - roles: - anonymous: anonymous 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 277581bb9..8b3de3a99 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/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml index 1fe541750..7f1aed990 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 @@ -177,16 +177,6 @@ content: sidebar: false use_details: true third_party_settings: { } - field_ontologyword_details: - type: readonly_field_widget - weight: 40 - region: content - settings: - label: above - formatter_type: null - formatter_settings: { } - show_description: false - third_party_settings: { } field_unit_type: type: entity_reference_autocomplete weight: 30 @@ -384,16 +374,6 @@ content: formatter_settings: { } show_description: false third_party_settings: { } - subgroup: - type: readonly_field_widget - weight: 40 - region: content - settings: - label: above - formatter_type: null - formatter_settings: { } - show_description: false - third_party_settings: { } toc_enabled: type: boolean_checkbox weight: 3 @@ -442,6 +422,26 @@ content: formatter_settings: { } show_description: false third_party_settings: { } + field_ontologyword_details: + type: readonly_field_widget + weight: 40 + region: content + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } + subgroup: + type: readonly_field_widget + weight: 40 + region: content + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } hidden: created: true field_categories: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index ee3678fe9..183c08381 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -142,13 +142,6 @@ content: third_party_settings: { } weight: 17 region: content - field_ontologyword_details: - type: tpr_ontologyword_details_formatter - label: hidden - settings: { } - third_party_settings: { } - weight: 28 - region: content highlights: type: tpr_connection label: hidden @@ -268,13 +261,6 @@ content: third_party_settings: { } weight: 16 region: content - subgroup: - type: tpr_connection - label: hidden - settings: { } - third_party_settings: { } - weight: 32 - region: content toc_enabled: type: boolean label: hidden @@ -311,6 +297,20 @@ content: third_party_settings: { } weight: 12 region: content + field_ontologyword_details: + type: tpr_ontologyword_details_formatter + label: hidden + settings: { } + third_party_settings: { } + weight: 28 + region: content + subgroup: + type: tpr_connection + label: hidden + settings: { } + third_party_settings: { } + weight: 32 + region: content hidden: created: true field_categories: true diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml index d4b167cbd..3558251b2 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml @@ -3,11 +3,11 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: S_jmMx3Y8JQYWaKpfNBtKxdWtWe14_in6SXuEqD9GPo + default_config_hash: NlhM_VFvjk8vl9Da66LXiKgwGHR3HUQaJrEE9cnID4s id: statistics label: Statistics description: - value: '

The information collected by statistics cookies is used for developing the website.

NameProviderPurpose of the cookieValidityType
nmstathel.fiThe Siteimprove statistics cookie collects information about the use of the website.1000 days 
_pk_id.*hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.141.89f6hel.fi-1 hour 
_pk_id.*kartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*kartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
_pk_id.*palvelukartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*palvelukartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
rnsbidreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rnsbid_tsreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rns_reaction_*reactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
YSCyoutube.comThe YouTube cookie facilitates including videos as part of the website''s content.SessionThird party
null_active_surveyNorstatThe id of the survey that is live.-Local storage
null_page_view_countNorstatHow many City of Helsinki pages have you viewed before seeing the survey-Local storage
null_active_scenarioNorstatWhat version of the survey module is live.-Local storage
wsLanguage_p933511862344NorstatLanguage identifier used to select which language of the survey you see.-Local storage
p933511862344_statusNorstatHave you already completed the survey.-Local storage
p933511862344_complete_dateNorstatDate and time when the survey was submitted-Localstorage
' + value: '

The information collected by statistics cookies is used for developing the website.

NameProviderPurpose of the cookieValidityType
nmstathel.fiThe Siteimprove statistics cookie collects information about the use of the website.1000 days 
_pk_id.*hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.141.89f6hel.fi-1 hour 
_pk_id.*kartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*kartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
_pk_id.*palvelukartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*palvelukartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
rnsbidreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rnsbid_tsreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rns_reaction_*reactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
YSCyoutube.comThe YouTube cookie facilitates including videos as part of the website''s content.SessionThird party
' format: full_html checkbox_default_state: unchecked weight: -7 diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml index 2ca752c11..8aab108aa 100644 --- a/conf/cmi/eu_cookie_compliance.settings.yml +++ b/conf/cmi/eu_cookie_compliance.settings.yml @@ -71,7 +71,7 @@ enable_save_preferences_button: true domain_all_sites: true settings_tab_enabled: false containing_element: body -cookie_policy_version: 1.2.1 +cookie_policy_version: 1.2.2 cookie_value_disagreed: '0' cookie_value_agreed_show_thank_you: '1' cookie_value_agreed: '2' diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml index 3ffc779f3..ed207fe2c 100644 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml +++ b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml @@ -1,4 +1,4 @@ description: - value: '

Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.

NimiTarjoajaTarkoitusVoimassaTyyppi
nmstathel.fiSiteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä.1000 päivää 
_pk_id.*hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.141.89f6hel.fi-1 tunti 
_pk_id.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
_pk_id.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
rnsbidreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Paikallinen muisti
rnsbid_tsreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Paikallinen muisti
rns_reaction_*reactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Paikallinen muisti
YSCyoutube.comYouTuben eväste mahdollistaa videoiden upottamisen sivustolle.IstuntoKolmas osapuoli
null_active_surveyNorstatKäynnissä olevan kyselyn tunnus-Paikallinen muisti
null_page_view_countNorstatKuinka monella Helsingin kaupungin
sivulla käyttäjä on vieraillut
ennen kyselyn näkymistä.		-Paikallinen muisti
null_active_scenarioNorstatMikä kyselymoduulin versio on käytössä.-Paikallinen muisti
wsLanguage_p933511862344NorstatKielitunniste, joka kertoo minkä kielinen kysely käyttäjälle näkyy-Paikallinen muisti
p933511862344_statusNorstatOletko jo vastannut kyselyyn-Paikallinen muisti
p933511862344_complete_dateNorstatPäivämäärä ja aika, jolloin kyselylomake lähetettiin.-Paikallinen muisti
' + value: '

Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.

NimiTarjoajaTarkoitusVoimassaTyyppi
nmstathel.fiSiteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä.1000 päivää 
_pk_id.*hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.141.89f6hel.fi-1 tunti 
_pk_id.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
_pk_id.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
rnsbidreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Paikallinen muisti
rnsbid_tsreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Paikallinen muisti
rns_reaction_*reactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Paikallinen muisti
YSCyoutube.comYouTuben eväste mahdollistaa videoiden upottamisen sivustolle.IstuntoKolmas osapuoli
' format: full_html label: Tilastointi diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml index f9ee79efe..e142011aa 100644 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml +++ b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml @@ -1,4 +1,4 @@ description: - value: '

De uppgifter statistikkakorna samlar in används för att utveckla webbplatsen.

NamnTjänsteleverantörCookie syfteGiltighetTyp
nmstathel.fiSiteimproves kaka samlar information om hur webbplatsen används.1000 dagar 
_pk_id.*hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.141.89f6hel.fi-1 timme 
_pk_id.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
_pk_id.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
rnsbidreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Lokalt minne
rnsbid_tsreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Lokalt minne
rns_reaction_*reactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Lokalt minne
YSCyoutube.comYouTubes kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.sessionTredje part
null_active_surveyNorstatId för undersökningen som är live.-Lokalt minne
null_page_view_countNorstatHur många Helsingfors stads sidor har du tittat på innan du såg undersökningen.-Lokalt minne
null_active_scenarioNorstatVilken version av undersökningsmodulen är live.-Lokalt minne
wsLanguage_p933511862344NorstatSpråkidentifierare som används för att välja vilket språk i undersökningen du ser.-Lokalt minne
p933511862344_statusNorstatHar du redan fyllt i undersökningen.-Lokalt minne
p933511862344_complete_dateNorstatDatum och tid då enkäten lämnades in.-Lokalt minne

 

' + value: '

De uppgifter statistikkakorna samlar in används för att utveckla webbplatsen.

NamnTjänsteleverantörCookie syfteGiltighetTyp
nmstathel.fiSiteimproves kaka samlar information om hur webbplatsen används.1000 dagar 
_pk_id.*hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.141.89f6hel.fi-1 timme 
_pk_id.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
_pk_id.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
rnsbidreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Lokalt minne
rnsbid_tsreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Lokalt minne
rns_reaction_*reactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Lokalt minne
YSCyoutube.comYouTubes kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.sessionTredje part

 

' format: full_html label: Statistik diff --git a/conf/cmi/metatag.metatag_defaults.global.yml b/conf/cmi/metatag.metatag_defaults.global.yml index e1a418d2c..886a531dc 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 a8d2f2471..3195b1eb1 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 14960c7fc..218211a86 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 000000000..4eecbdfb8 --- /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