From c1df23c4eaa5bb5d3fcc0e9d50d7c7278f87c541 Mon Sep 17 00:00:00 2001
From: Tero Elonen <tero.elonen@druid.fi>
Date: Thu, 14 Mar 2024 15:24:03 +0200
Subject: [PATCH] UHF-9761: Updated cookie compliance so that it no longer has
 references to user inquiry

---
 .../eu_cookie_compliance.cookie_category.statistics.yml   | 2 +-
 .../eu_cookie_compliance.cookie_category.statistics.yml   | 2 +-
 .../eu_cookie_compliance.cookie_category.statistics.yml   | 2 +-
 .../config/rewrite/eu_cookie_compliance.settings.yml      | 2 +-
 .../helfi_eu_cookie_compliance.install                    | 8 ++++++++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/helfi_eu_cookie_compliance/config/install/eu_cookie_compliance.cookie_category.statistics.yml b/modules/helfi_eu_cookie_compliance/config/install/eu_cookie_compliance.cookie_category.statistics.yml
index 93dd1dd32..4193befd4 100644
--- a/modules/helfi_eu_cookie_compliance/config/install/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/modules/helfi_eu_cookie_compliance/config/install/eu_cookie_compliance.cookie_category.statistics.yml
@@ -7,7 +7,7 @@ _core:
 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
diff --git a/modules/helfi_eu_cookie_compliance/config/optional/language/fi/eu_cookie_compliance.cookie_category.statistics.yml b/modules/helfi_eu_cookie_compliance/config/optional/language/fi/eu_cookie_compliance.cookie_category.statistics.yml
index 3ffc779f3..ed207fe2c 100644
--- a/modules/helfi_eu_cookie_compliance/config/optional/language/fi/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/modules/helfi_eu_cookie_compliance/config/optional/language/fi/eu_cookie_compliance.cookie_category.statistics.yml
@@ -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
diff --git a/modules/helfi_eu_cookie_compliance/config/optional/language/sv/eu_cookie_compliance.cookie_category.statistics.yml b/modules/helfi_eu_cookie_compliance/config/optional/language/sv/eu_cookie_compliance.cookie_category.statistics.yml
index f9ee79efe..e142011aa 100644
--- a/modules/helfi_eu_cookie_compliance/config/optional/language/sv/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/modules/helfi_eu_cookie_compliance/config/optional/language/sv/eu_cookie_compliance.cookie_category.statistics.yml
@@ -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
diff --git a/modules/helfi_eu_cookie_compliance/config/rewrite/eu_cookie_compliance.settings.yml b/modules/helfi_eu_cookie_compliance/config/rewrite/eu_cookie_compliance.settings.yml
index 2ca752c11..8aab108aa 100644
--- a/modules/helfi_eu_cookie_compliance/config/rewrite/eu_cookie_compliance.settings.yml
+++ b/modules/helfi_eu_cookie_compliance/config/rewrite/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/modules/helfi_eu_cookie_compliance/helfi_eu_cookie_compliance.install b/modules/helfi_eu_cookie_compliance/helfi_eu_cookie_compliance.install
index 215266cd7..d63140393 100644
--- a/modules/helfi_eu_cookie_compliance/helfi_eu_cookie_compliance.install
+++ b/modules/helfi_eu_cookie_compliance/helfi_eu_cookie_compliance.install
@@ -76,3 +76,11 @@ function helfi_eu_cookie_compliance_update_9005(): void {
   \Drupal::service('helfi_platform_config.config_update_helper')
     ->update('helfi_eu_cookie_compliance');
 }
+
+/**
+ * UHF-9761: Updates statistics cookies and remove references for user inquiry.
+ */
+function helfi_eu_cookie_compliance_update_9006(): void {
+  \Drupal::service('helfi_platform_config.config_update_helper')
+    ->update('helfi_eu_cookie_compliance');
+}