Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatic update #549

Merged
merged 1 commit into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 76 additions & 82 deletions composer.lock

Large diffs are not rendered by default.

40 changes: 0 additions & 40 deletions conf/cmi/block.block.hdbt_subtheme_user_inquiry.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: '<p>The information collected by statistics cookies is used for developing the website.</p><figure class="table" tabindex="0"><table><thead><tr><th>Name</th><th>Provider</th><th>Purpose of the cookie</th><th>Validity</th><th>Type</th></tr></thead><tbody><tr><td>nmstat</td><td>hel.fi</td><td>The Siteimprove statistics cookie collects information about the use of the website.</td><td>1000 days</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>hel.fi</td><td>Matomo Analytics - used to store a few details about the user such as the unique visitor ID</td><td>393 days</td><td>&nbsp;</td></tr><tr><td>_pk_ses.141.89f6</td><td>hel.fi</td><td>-</td><td>1 hour</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>kartta.hel.fi</td><td>Matomo Analytics - used to store a few details about the user such as the unique visitor ID</td><td>393 days</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>kartta.hel.fi</td><td>Matomo Analytics - short lived cookies used to temporarily store data for the visit</td><td>1 hour</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>palvelukartta.hel.fi</td><td>Matomo Analytics - used to store a few details about the user such as the unique visitor ID</td><td>393 days</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>palvelukartta.hel.fi</td><td>Matomo Analytics - short lived cookies used to temporarily store data for the visit</td><td>1 hour</td><td>&nbsp;</td></tr><tr><td>rnsbid</td><td><span>reactandshare.com</span></td><td><p><span>A record related to the operation of the&nbsp;</span></p><p><span>Askem</span></p><p><span>&nbsp;react buttons.</span></p></td><td>-</td><td>Local storage</td></tr><tr><td>rnsbid_ts</td><td><span>reactandshare.com</span></td><td><p><span>A record related to the operation of the&nbsp;</span></p><p><span>Askem</span></p><p><span>&nbsp;react buttons.</span></p></td><td>-</td><td>Local storage</td></tr><tr><td>rns_reaction_*</td><td><span>reactandshare.com</span></td><td><p><span>A record related to the operation of the&nbsp;</span></p><p><span>Askem</span></p><p><span>&nbsp;react buttons.</span></p></td><td>-</td><td>Local storage</td></tr><tr><td>YSC</td><td>youtube.com</td><td>The YouTube cookie facilitates including videos as part of the website''s content.</td><td>Session</td><td>Third party</td></tr><tr><td><span>null_active_survey</span></td><td>Norstat</td><td><span>The id of the survey that is live.</span></td><td>-</td><td>Local storage</td></tr><tr><td><span>null_page_view_count</span></td><td>Norstat</td><td><span dir="ltr" role="presentation">How many City of Helsinki pages have you viewed before seeing the survey</span></td><td>-</td><td>Local storage</td></tr><tr><td><span>null_active_scenario</span></td><td>Norstat</td><td><span dir="ltr" role="presentation">What version of the survey module is live.</span></td><td>-</td><td>Local storage</td></tr><tr><td><span>wsLanguage_p933511862344</span></td><td>Norstat</td><td><span dir="ltr" role="presentation">Language identifier used to select which language of the survey you see.</span></td><td>-</td><td>Local storage</td></tr><tr><td><span>p933511862344_status</span></td><td>Norstat</td><td>Have you already completed the survey.</td><td>-</td><td>Local storage</td></tr><tr><td>p933511862344_complete_date</td><td>Norstat</td><td>Date and time when the survey was submitted</td><td>-</td><td>Localstorage</td></tr></tbody></table></figure>'
value: '<p>The information collected by statistics cookies is used for developing the website.</p><figure class="table" tabindex="0"><table><thead><tr><th>Name</th><th>Provider</th><th>Purpose of the cookie</th><th>Validity</th><th>Type</th></tr></thead><tbody><tr><td>nmstat</td><td>hel.fi</td><td>The Siteimprove statistics cookie collects information about the use of the website.</td><td>1000 days</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>hel.fi</td><td>Matomo Analytics - used to store a few details about the user such as the unique visitor ID</td><td>393 days</td><td>&nbsp;</td></tr><tr><td>_pk_ses.141.89f6</td><td>hel.fi</td><td>-</td><td>1 hour</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>kartta.hel.fi</td><td>Matomo Analytics - used to store a few details about the user such as the unique visitor ID</td><td>393 days</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>kartta.hel.fi</td><td>Matomo Analytics - short lived cookies used to temporarily store data for the visit</td><td>1 hour</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>palvelukartta.hel.fi</td><td>Matomo Analytics - used to store a few details about the user such as the unique visitor ID</td><td>393 days</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>palvelukartta.hel.fi</td><td>Matomo Analytics - short lived cookies used to temporarily store data for the visit</td><td>1 hour</td><td>&nbsp;</td></tr><tr><td>rnsbid</td><td><span>reactandshare.com</span></td><td><p><span>A record related to the operation of the&nbsp;</span></p><p><span>Askem</span></p><p><span>&nbsp;react buttons.</span></p></td><td>-</td><td>Local storage</td></tr><tr><td>rnsbid_ts</td><td><span>reactandshare.com</span></td><td><p><span>A record related to the operation of the&nbsp;</span></p><p><span>Askem</span></p><p><span>&nbsp;react buttons.</span></p></td><td>-</td><td>Local storage</td></tr><tr><td>rns_reaction_*</td><td><span>reactandshare.com</span></td><td><p><span>A record related to the operation of the&nbsp;</span></p><p><span>Askem</span></p><p><span>&nbsp;react buttons.</span></p></td><td>-</td><td>Local storage</td></tr><tr><td>YSC</td><td>youtube.com</td><td>The YouTube cookie facilitates including videos as part of the website''s content.</td><td>Session</td><td>Third party</td></tr></tbody></table></figure>'
format: full_html
checkbox_default_state: unchecked
weight: -7
2 changes: 1 addition & 1 deletion conf/cmi/eu_cookie_compliance.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
description:
value: '<p>Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.</p><figure class="table" tabindex="0"><table><thead><tr><th>Nimi</th><th>Tarjoaja</th><th>Tarkoitus</th><th>Voimassa</th><th>Tyyppi</th></tr></thead><tbody><tr><td>nmstat</td><td>hel.fi</td><td>Siteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä.</td><td>1000 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.141.89f6</td><td>hel.fi</td><td>-</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>kartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>kartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>palvelukartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>palvelukartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>rnsbid</td><td><span>reactandshare.com</span></td><td><span>Askem-reaktionappien toimintaan liittyvä tietue.</span></td><td>-</td><td>Paikallinen muisti</td></tr><tr><td>rnsbid_ts</td><td><span>reactandshare.com</span></td><td><span>Askem-reaktionappien toimintaan liittyvä tietue.</span></td><td>-</td><td>Paikallinen muisti</td></tr><tr><td>rns_reaction_*</td><td><span>reactandshare.com</span></td><td><span>Askem-reaktionappien toimintaan liittyvä tietue.</span></td><td>-</td><td>Paikallinen muisti</td></tr><tr><td>YSC</td><td>youtube.com</td><td>YouTuben eväste mahdollistaa videoiden upottamisen sivustolle.</td><td>Istunto</td><td>Kolmas osapuoli</td></tr><tr><td><span>null_active_survey</span></td><td>Norstat</td><td><span>Käynnissä olevan kyselyn tunnus</span></td><td>-</td><td>Paikallinen muisti</td></tr><tr><td><span>null_page_view_count</span></td><td>Norstat</td><td><span dir="ltr" role="presentation">Kuinka monella Helsingin kaupungin</span><br><span dir="ltr" role="presentation">sivulla käyttäjä on vieraillut</span><br><span dir="ltr" role="presentation">ennen kyselyn näkymistä.</span></td><td>-</td><td>Paikallinen muisti</td></tr><tr><td><span>null_active_scenario</span></td><td>Norstat</td><td><span dir="ltr" role="presentation">Mikä kyselymoduulin versio on käytössä.</span></td><td>-</td><td>Paikallinen muisti</td></tr><tr><td><span>wsLanguage_p933511862344</span></td><td>Norstat</td><td><span dir="ltr" role="presentation">Kielitunniste, joka kertoo minkä kielinen kysely käyttäjälle näkyy</span></td><td>-</td><td>Paikallinen muisti</td></tr><tr><td><span>p933511862344_status</span></td><td>Norstat</td><td>Oletko jo vastannut kyselyyn</td><td>-</td><td>Paikallinen muisti</td></tr><tr><td>p933511862344_complete_date</td><td>Norstat</td><td>Päivämäärä ja aika, jolloin kyselylomake lähetettiin.</td><td>-</td><td>Paikallinen muisti</td></tr></tbody></table></figure>'
value: '<p>Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.</p><figure class="table" tabindex="0"><table><thead><tr><th>Nimi</th><th>Tarjoaja</th><th>Tarkoitus</th><th>Voimassa</th><th>Tyyppi</th></tr></thead><tbody><tr><td>nmstat</td><td>hel.fi</td><td>Siteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä.</td><td>1000 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.141.89f6</td><td>hel.fi</td><td>-</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>kartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>kartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>palvelukartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>palvelukartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>rnsbid</td><td><span>reactandshare.com</span></td><td><span>Askem-reaktionappien toimintaan liittyvä tietue.</span></td><td>-</td><td>Paikallinen muisti</td></tr><tr><td>rnsbid_ts</td><td><span>reactandshare.com</span></td><td><span>Askem-reaktionappien toimintaan liittyvä tietue.</span></td><td>-</td><td>Paikallinen muisti</td></tr><tr><td>rns_reaction_*</td><td><span>reactandshare.com</span></td><td><span>Askem-reaktionappien toimintaan liittyvä tietue.</span></td><td>-</td><td>Paikallinen muisti</td></tr><tr><td>YSC</td><td>youtube.com</td><td>YouTuben eväste mahdollistaa videoiden upottamisen sivustolle.</td><td>Istunto</td><td>Kolmas osapuoli</td></tr></tbody></table></figure>'
format: full_html
label: Tilastointi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
description:
value: '<p>De uppgifter statistikkakorna samlar in används för att utveckla webbplatsen.</p><figure class="table" tabindex="0"><table><thead><tr><th>Namn</th><th>Tjänsteleverantör</th><th>Cookie syfte</th><th>Giltighet</th><th>Typ</th></tr></thead><tbody><tr><td>nmstat</td><td>hel.fi</td><td>Siteimproves kaka samlar information om hur webbplatsen används.</td><td>1000 dagar</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>hel.fi</td><td>Matomo-statistiksystemets kaka samlar information om hur webbplatsen används.</td><td>393 dagar</td><td>&nbsp;</td></tr><tr><td>_pk_ses.141.89f6</td><td>hel.fi</td><td>-</td><td>1 timme</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>kartta.hel.fi</td><td>Matomo-statistiksystemets kaka samlar information om hur webbplatsen används.</td><td>393 dagar</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>kartta.hel.fi</td><td>Matomo-statistiksystemets kaka samlar information om hur webbplatsen används.</td><td>1 timme</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>palvelukartta.hel.fi</td><td>Matomo-statistiksystemets kaka samlar information om hur webbplatsen används.</td><td>393 dagar</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>palvelukartta.hel.fi</td><td>Matomo-statistiksystemets kaka samlar information om hur webbplatsen används.</td><td>1 timme</td><td>&nbsp;</td></tr><tr><td>rnsbid</td><td><span>reactandshare.com</span></td><td><p><span>En post relaterad till driften av reaktionsknappen&nbsp;</span></p><p><span>Askem</span></p><p><span>.</span></p></td><td>-</td><td><span>Lokalt minne</span></td></tr><tr><td>rnsbid_ts</td><td><span>reactandshare.com</span></td><td><p><span>En post relaterad till driften av reaktionsknappen&nbsp;</span></p><p><span>Askem</span></p><p><span>.</span></p></td><td>-</td><td><span>Lokalt minne</span></td></tr><tr><td>rns_reaction_*</td><td><span>reactandshare.com</span></td><td><p><span>En post relaterad till driften av reaktionsknappen&nbsp;</span></p><p><span>Askem</span></p><p><span>.</span></p></td><td>-</td><td><span>Lokalt minne</span></td></tr><tr><td>YSC</td><td>youtube.com</td><td>YouTubes kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.</td><td>session</td><td>Tredje part</td></tr><tr><td><span>null_active_survey</span></td><td>Norstat</td><td><span dir="ltr" role="presentation">Id för undersökningen som är live.</span></td><td>-</td><td><span>Lokalt minne</span></td></tr><tr><td><span>null_page_view_count</span></td><td>Norstat</td><td><span dir="ltr" role="presentation">Hur många Helsingfors stads sidor har du tittat på innan du såg undersökningen.</span></td><td>-</td><td><span>Lokalt minne</span></td></tr><tr><td><span>null_active_scenario</span></td><td>Norstat</td><td><span dir="ltr" role="presentation">Vilken version av undersökningsmodulen är live.</span></td><td>-</td><td><span>Lokalt minne</span></td></tr><tr><td><span>wsLanguage_p933511862344</span></td><td>Norstat</td><td><span dir="ltr" role="presentation">Språkidentifierare som används för att välja vilket språk i undersökningen du ser.</span></td><td>-</td><td><span>Lokalt minne</span></td></tr><tr><td><span>p933511862344_status</span></td><td>Norstat</td><td>Har du redan fyllt i undersökningen.</td><td>-</td><td><span>Lokalt minne</span></td></tr><tr><td>p933511862344_complete_date</td><td>Norstat</td><td>Datum och tid då enkäten lämnades in.</td><td>-</td><td><span>Lokalt minne</span></td></tr></tbody></table></figure><p>&nbsp;</p>'
value: '<p>De uppgifter statistikkakorna samlar in används för att utveckla webbplatsen.</p><figure class="table" tabindex="0"><table><thead><tr><th>Namn</th><th>Tjänsteleverantör</th><th>Cookie syfte</th><th>Giltighet</th><th>Typ</th></tr></thead><tbody><tr><td>nmstat</td><td>hel.fi</td><td>Siteimproves kaka samlar information om hur webbplatsen används.</td><td>1000 dagar</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>hel.fi</td><td>Matomo-statistiksystemets kaka samlar information om hur webbplatsen används.</td><td>393 dagar</td><td>&nbsp;</td></tr><tr><td>_pk_ses.141.89f6</td><td>hel.fi</td><td>-</td><td>1 timme</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>kartta.hel.fi</td><td>Matomo-statistiksystemets kaka samlar information om hur webbplatsen används.</td><td>393 dagar</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>kartta.hel.fi</td><td>Matomo-statistiksystemets kaka samlar information om hur webbplatsen används.</td><td>1 timme</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>palvelukartta.hel.fi</td><td>Matomo-statistiksystemets kaka samlar information om hur webbplatsen används.</td><td>393 dagar</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>palvelukartta.hel.fi</td><td>Matomo-statistiksystemets kaka samlar information om hur webbplatsen används.</td><td>1 timme</td><td>&nbsp;</td></tr><tr><td>rnsbid</td><td><span>reactandshare.com</span></td><td><p><span>En post relaterad till driften av reaktionsknappen&nbsp;</span></p><p><span>Askem</span></p><p><span>.</span></p></td><td>-</td><td><span>Lokalt minne</span></td></tr><tr><td>rnsbid_ts</td><td><span>reactandshare.com</span></td><td><p><span>En post relaterad till driften av reaktionsknappen&nbsp;</span></p><p><span>Askem</span></p><p><span>.</span></p></td><td>-</td><td><span>Lokalt minne</span></td></tr><tr><td>rns_reaction_*</td><td><span>reactandshare.com</span></td><td><p><span>En post relaterad till driften av reaktionsknappen&nbsp;</span></p><p><span>Askem</span></p><p><span>.</span></p></td><td>-</td><td><span>Lokalt minne</span></td></tr><tr><td>YSC</td><td>youtube.com</td><td>YouTubes kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.</td><td>session</td><td>Tredje part</td></tr></tbody></table></figure><p>&nbsp;</p>'
format: full_html
label: Statistik
4 changes: 2 additions & 2 deletions conf/cmi/metatag.metatag_defaults.global.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]'
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 10 additions & 0 deletions docker/openshift/crons/linked-events.sh
Original file line number Diff line number Diff line change
@@ -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