Merge pull request #39 from City-of-Helsinki/UHF-9755-remove-custom-c…

…ookies

UHF-9755: remove custom cookies

conf/cmi/core.entity_form_display.node.landing_page.default.yml

@@ -128,9 +128,9 @@ content:
     third_party_settings: {  }
   simple_sitemap:
     weight: 10
-    region: content
     settings: {  }
     third_party_settings: {  }
+    region: content
   status:
     type: boolean_checkbox
     weight: 12

conf/cmi/core.entity_form_display.node.news_item.default.yml

@@ -201,9 +201,9 @@ content:
     third_party_settings: {  }
   simple_sitemap:
     weight: 10
-    region: content
     settings: {  }
     third_party_settings: {  }
+    region: content
   status:
     type: boolean_checkbox
     weight: 14

conf/cmi/core.entity_form_display.paragraph.banner.default.yml

@@ -42,8 +42,8 @@ content:
     weight: 4
     region: content
     settings:
-      linkit_profile: helfi
       linkit_auto_link_text: false
+      linkit_profile: helfi
     third_party_settings: {  }
   field_banner_link_design:
     type: design_field_widget

conf/cmi/core.entity_form_display.paragraph.columns.default.yml

@@ -29,8 +29,8 @@ content:
     weight: 2
     region: content
     settings:
-      title: Lohko
-      title_plural: Lohkot
+      title: Paragraph
+      title_plural: Paragraphs
       edit_mode: closed_expand_nested
       closed_mode: summary
       autocollapse: none
@@ -48,8 +48,8 @@ content:
     weight: 3
     region: content
     settings:
-      title: Lohko
-      title_plural: Lohkot
+      title: Paragraph
+      title_plural: Paragraphs
       edit_mode: closed_expand_nested
       closed_mode: summary
       autocollapse: none

conf/cmi/core.entity_form_display.paragraph.list_of_links.default.yml

@@ -28,8 +28,8 @@ content:
     weight: 2
     region: content
     settings:
-      title: Lohko
-      title_plural: Lohkot
+      title: Paragraph
+      title_plural: Paragraphs
       edit_mode: closed_expand_nested
       closed_mode: summary
       autocollapse: none

conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml

@@ -40,8 +40,8 @@ content:
     weight: 1
     region: content
     settings:
-      linkit_profile: helfi
       linkit_auto_link_text: false
+      linkit_profile: helfi
     third_party_settings: {  }
 hidden:
   created: true

conf/cmi/core.entity_view_display.node.news_item.default.yml

@@ -32,24 +32,14 @@ content:
       view_mode: default
       link: ''
     third_party_settings: {  }
-    weight: 6
-    region: content
-  field_is_crisis_news:
-    type: boolean
-    label: above
-    settings:
-      format: default
-      format_custom_false: ''
-      format_custom_true: ''
-    third_party_settings: {  }
-    weight: 2
+    weight: 5
     region: content
   field_lead_in:
     type: text_span
     label: hidden
     settings: {  }
     third_party_settings: {  }
-    weight: 3
+    weight: 2
     region: content
   field_main_image:
     type: entity_reference_entity_view
@@ -58,14 +48,14 @@ content:
       view_mode: image_content_area
       link: false
     third_party_settings: {  }
-    weight: 5
+    weight: 4
     region: content
   field_main_image_caption:
     type: text_span
     label: inline
     settings: {  }
     third_party_settings: {  }
-    weight: 9
+    weight: 8
     region: content
   field_news_item_links_link:
     type: link
@@ -77,15 +67,15 @@ content:
       rel: '0'
       target: '0'
     third_party_settings: {  }
-    weight: 8
+    weight: 7
     region: content
   field_news_item_links_title:
     type: string
     label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 7
+    weight: 6
     region: content
   field_short_title:
     type: string
@@ -117,7 +107,17 @@ content:
         granularity: 2
         refresh: 60
     third_party_settings: {  }
-    weight: 4
+    weight: 3
+    region: content
+  field_is_crisis_news:
+    type: boolean
+    label: above
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 2
     region: content
 hidden:
   field_news_item_tags: true

conf/cmi/core.entity_view_display.paragraph.hearings.default.yml

@@ -31,9 +31,9 @@ content:
     weight: 0
     region: content
   list:
+    weight: 100
     settings: {  }
     third_party_settings: {  }
-    weight: 100
     region: content
 hidden:
   search_api_excerpt: true

conf/cmi/core.extension.yml

@@ -40,6 +40,7 @@ module:
   helfi_api_base: 0
   helfi_base_content: 0
   helfi_ckeditor: 0
+  helfi_emergency_config: 0
   helfi_emergency_general: 0
   helfi_eu_cookie_compliance: 0
   helfi_image_styles: 0

conf/cmi/eu_cookie_compliance.cookie_category.chat.yml

@@ -0,0 +1,13 @@
+uuid: 6f1bc78f-379c-4826-bcfb-a374144f2f76
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: xNnKeE0hcae-UY0_lNU6QCmWy0Or-D1YSjvlmrh2xuo
+id: chat
+label: 'Functional chat cookies'
+description:
+  value: '<p>The chats on the hel.fi&nbsp; website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.&nbsp; No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.</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>_genesys.widgets.*</td><td>hel.fi</td><td>Used for storing data required by the chat functionality.</td><td>Session</td><td>&nbsp;</td></tr><tr><td>leijuke.*</td><td>hel.fi</td><td>Used for storing data required by the chat functionality.</td><td>Session</td><td>&nbsp;</td></tr></tbody></table></figure>'
+  format: full_html
+checkbox_default_state: unchecked
+weight: -5

conf/cmi/eu_cookie_compliance.cookie_category.essential.yml

@@ -3,11 +3,11 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: _t7KlporqDL3DArj6oSOO8nYsti4sn1kbsjV_-srYzM
+  default_config_hash: ujEJIqkiAV4NaTCVYoK6BHX9wxK5UhNvgjF0PwWGPKA
 id: essential
 label: 'Essential cookies'
 description:
-  value: "<p>Essential cookies help to make the website usable by allowing basic functions, navigating the page and using the protected areas of the site. The website will not work properly without these cookies and their consent is not required.</p>\r\n\r\n<table>\r\n\t<thead>\r\n\t\t<tr>\r\n\t\t\t<th>Name</th>\r\n\t\t\t<th>Provider</th>\r\n\t\t\t<th>Purpose of the cookie</th>\r\n\t\t\t<th>Validity</th>\r\n\t\t\t<th>Type</th>\r\n\t\t</tr>\r\n\t</thead>\r\n\t<tbody>\r\n\t\t<tr>\r\n\t\t\t<td>cookie-agreed</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used by hel.fi Drupal to store information&nbsp;about whether visitors have given or declined the use of cookie categories used on the hel.fi site.</td>\r\n\t\t\t<td>100 days</td>\r\n\t\t\t<td></td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>cookie-agreed-version</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used by hel.fi Drupal to store information&nbsp;about what version of the cookie consent the user has agreed to.</td>\r\n\t\t\t<td>100 days</td>\r\n\t\t\t<td></td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>cookie-agreed-categories</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used by hel.fi Drupal to store information&nbsp;about what cookie categories the user has agreed to.</td>\r\n\t\t\t<td>100 days</td>\r\n\t\t\t<td></td>\r\n\t\t</tr>\r\n\t</tbody>\r\n</table>\r\n"
+  value: '<p>Essential cookies help to make the website usable by allowing basic functions, navigating the page and using the protected areas of the site. The website will not work properly without these cookies and their consent is not required.</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>cookiehub</td><td>cookiehub.com</td><td>Used by CookieHub to store information about whether visitors have given or declined the use of cookie categories used on the hel.fi site.</td><td>365 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed</td><td>hel.fi</td><td>Used by hel.fi Drupal to store information&nbsp;about whether visitors have given or declined the use of cookie categories used on the hel.fi site.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-version</td><td>hel.fi</td><td>Used by hel.fi Drupal to store information&nbsp;about what version of the cookie consent the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-categories</td><td>hel.fi</td><td>Used by hel.fi Drupal to store information&nbsp;about what cookie categories the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>SSESS*</td><td>hel.fi</td><td>A cookie related to the operation of the content management system.</td><td>23 days</td><td>&nbsp;</td></tr><tr><td>AWSELBCORS</td><td>siteimproveanalytics.io</td><td>The cookie is related to a load distribution function used to direct requests to servers with the least traffic.</td><td>Session</td><td>Third party</td></tr><tr><td>mtm_cookie_consent</td><td>kartta.hel.fi</td><td>A technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.</td><td>10950 days</td><td>&nbsp;</td></tr><tr><td>JSESSIONID</td><td><p>helsinkikanava.fi</p><p>coh-chat-app-prod.eu-de.mybluemix.net</p></td><td>The cookie is an obligatory cookie that facilitates visiting the website.</td><td>Session</td><td>Third party</td></tr><tr><td>COOKIE_SUPPORT</td><td>helsinkikanava.fi</td><td>The cookie facilitates managing cookies on the website.</td><td>365 days</td><td>Third party</td></tr><tr><td>GUEST_LANGUAGE_ID</td><td>helsinkikanava.fi</td><td>This cookie is generated by the Liferay, its&nbsp;function is to store the language preferences.</td><td>365 days</td><td>Third party</td></tr></tbody></table></figure>'
   format: full_html
 checkbox_default_state: required
-weight: -10
+weight: -9

conf/cmi/eu_cookie_compliance.cookie_category.preference.yml

@@ -3,11 +3,11 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: Z1hhaGuFxO5u3okdCurl5uTPrPMl4SbozTZaBotYy3k
+  default_config_hash: YFGMD4KVRhhDUqFw1sVymoaelefU_LjdLgOF-fipCCQ
 id: preference
 label: Preference
 description:
-  value: "<p>Preference cookies modify the visuals and functions of the website based on the user's previous sessions.</p>\r\n\r\n<table>\r\n\t<thead>\r\n\t\t<tr>\r\n\t\t\t<th>Name</th>\r\n\t\t\t<th>Provider</th>\r\n\t\t\t<th>Purpose of the cookie</th>\r\n\t\t\t<th>Validity</th>\r\n\t\t\t<th>Type</th>\r\n\t\t</tr>\r\n\t</thead>\r\n\t<tbody>\r\n\t\t<tr>\r\n\t\t\t<td>ct0</td>\r\n\t\t\t<td>.twitter.com</td>\r\n\t\t\t<td>\r\n\t\t\t<p>This cookie is for authentication.</p>\r\n\t\t\t</td>\r\n\t\t\t<td>4 hours</td>\r\n\t\t\t<td>Third party</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>guest_id</td>\r\n\t\t\t<td>.twitter.com</td>\r\n\t\t\t<td>\r\n\t\t\t<p>This cookie is for authentication.</p>\r\n\t\t\t</td>\r\n\t\t\t<td>1 month</td>\r\n\t\t\t<td>Third party</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td></td>\r\n\t\t\t<td>facebook.com</td>\r\n\t\t\t<td>\r\n\t\t\t<p>Iframe pixel</p>\r\n\t\t\t</td>\r\n\t\t\t<td></td>\r\n\t\t\t<td>Third party</td>\r\n\t\t</tr>\r\n\t</tbody>\r\n</table>\r\n"
+  value: '<p>Preference cookies modify the visuals and functions of the website based on the user''s previous sessions.</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>httpskartta.hel.fi.SWCulture</td><td>kartta.hel.fi</td><td>The City''s map service cookie saves the language in which the service is used.</td><td>1826 days</td><td>&nbsp;</td></tr><tr><td>icareus-device</td><td>helsinkikanava.fi</td><td>The Helsinki Channel video server cookie facilitates including videos as part of the website''s content.</td><td>365 days</td><td>Third party</td></tr><tr><td>VISITOR_INFO1_LIVE</td><td>youtube.com</td><td>The YouTube cookie selects the old or new video player depending on the connection speed.</td><td>180 days</td><td>Third party</td></tr><tr><td>CONSENT</td><td>youtube.com</td><td>Used by Google to store user consent preferences</td><td>5947 days, 15 hours</td><td>Third party</td></tr></tbody></table></figure>'
   format: full_html
 checkbox_default_state: unchecked
 weight: -8

conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml

@@ -3,11 +3,11 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: KE94aKL1mb_W5FdLIATbr09dWpldobitqdVQlR_gjYU
+  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>\r\n\r\n<table>\r\n\t<thead>\r\n\t\t<tr>\r\n\t\t\t<th>Name</th>\r\n\t\t\t<th>Provider</th>\r\n\t\t\t<th>Purpose of the cookie</th>\r\n\t\t\t<th>Validity</th>\r\n\t\t\t<th>Type</th>\r\n\t\t</tr>\r\n\t</thead>\r\n\t<tbody>\r\n\t\t<tr>\r\n\t\t\t<td>_pk_id.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>\r\n\t\t\t<p>Matomo Analytics - used to store a few details about the user such as the unique visitor ID</p>\r\n\t\t\t</td>\r\n\t\t\t<td>393 days</td>\r\n\t\t\t<td></td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>_pk_ses.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Matomo Analytics - short lived cookies used to temporarily store data for the visit</td>\r\n\t\t\t<td>1 hour</td>\r\n\t\t\t<td></td>\r\n\t\t</tr>\r\n\t</tbody>\r\n</table>\r\n"
+  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: -9
+weight: -7

conf/cmi/eu_cookie_compliance.settings.yml

@@ -60,7 +60,7 @@ better_support_for_screen_readers: false
 method: categories
 disabled_javascripts: ''
 automatic_cookies_removal: true
-allowed_cookies: "essential:AWSELB\r\nessential:AWSELBCORS\r\nessential:cookiehub\r\nessential:mtm_cookie_consent\r\nessential:frosmo_quickContext\r\nessential:id\r\nessential:JSESSIONID\r\nessential:COOKIE_SUPPORT\r\npreference:httpskartta.hel.fi.SWCulture\r\npreference:icareus-device\r\npreference:VISITOR_INFO1_LIVE\r\npreference:CONSENT\r\nstatistics:Snoobisession_hel_fi\r\nstatistics:Snoobi30minute_hel_fi\r\nstatistics:SnoobiID\r\nstatistics:nmstat\r\nstatistics:Snoobisession_hel_projektit\r\nstatistics:Snoobi30minute_hel_projektit\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.141.89f6\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:__utma\r\nstatistics:__utmc\r\nstatistics:__utmz\r\nstatistics:__utmt\r\nstatistics:__utmb\r\nstatistics:__utmb\r\nstatistics:YSC\r\nmarketing:IDE\r\nchat:_genesys.widgets.*\r\nchat:__VCAP_ID__\r\nchat:gcReturnSessionId \r\nchat:gcAlternativeReturnUrl \r\nchat:gcReturnUrl \r\nchat:gcLoginButtonState\r\nchat:leijuke.*\r\nchat:connect.sid"
+allowed_cookies: "helfi_accordions_open\r\nessential:AWSELBCORS\r\nessential:cookiehub\r\nessential:mtm_cookie_consent\r\nessential:JSESSIONID\r\nessential:COOKIE_SUPPORT\r\nessential:GUEST_LANGUAGE_ID\r\npreference:httpskartta.hel.fi.SWCulture\r\npreference:icareus-device\r\npreference:VISITOR_INFO1_LIVE\r\npreference:CONSENT\r\nstatistics:nmstat\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.141.89f6\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:rnsbid\r\nstatistics:rnsbid_ts\r\nstatistics:rns_reaction_*\r\nstatistics:YSC\r\nchat:_genesys.widgets.*\r\nchat:leijuke.*"
 consent_storage_method: do_not_store
 withdraw_message:
   value: '<h2>Hel.fi uses cookies</h2><p>You have given your consent for us to set cookies.</p>'
@@ -75,7 +75,7 @@ enable_save_preferences_button: true
 domain_all_sites: true
 settings_tab_enabled: false
 containing_element: body
-cookie_policy_version: 1.1.0
+cookie_policy_version: 1.2.2
 cookie_value_disagreed: '0'
 cookie_value_agreed_show_thank_you: '1'
 cookie_value_agreed: '2'

conf/cmi/external_entities.external_entity_type.helfi_hearings.yml

@@ -8,8 +8,8 @@ id: helfi_hearings
 label: 'Helfi: Hearing'
 label_plural: 'Helfi: Hearing'
 description: 'Helfi hearings from hearing api.'
-read_only: true
 generate_aliases: false
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

conf/cmi/field.field.node.landing_page.field_content.yml

@@ -39,19 +39,19 @@ settings:
   handler_settings:
     target_bundles:
       crisis_news_paragraph: crisis_news_paragraph
-      columns: columns
       list_of_links: list_of_links
       content_cards: content_cards
       banner: banner
       liftup_with_image: liftup_with_image
+      popular_services: popular_services
       from_library: from_library
-      chart: chart
-      remote_video: remote_video
-      map: map
-      event_list: event_list
+      columns: columns
       phasing: phasing
-      popular_services: popular_services
+      map: map
+      remote_video: remote_video
+      chart: chart
       target_group_links: target_group_links
+      event_list: event_list
       hearings: hearings
     negate: 0
     target_bundles_drag_drop:

conf/cmi/field.field.node.news_item.field_content.yml

@@ -32,9 +32,9 @@ settings:
   handler_settings:
     target_bundles:
       text: text
-      banner: banner
       image: image
       remote_video: remote_video
+      banner: banner
     negate: 0
     target_bundles_drag_drop:
       banner:

conf/cmi/field.field.paragraph.columns.field_columns_left_column.yml

@@ -15,7 +15,7 @@ id: paragraph.columns.field_columns_left_column
 field_name: field_columns_left_column
 entity_type: paragraph
 bundle: columns
-label: 'Vasen palsta'
+label: 'Left column'
 description: ''
 required: true
 translatable: false