Merge pull request #615 from City-of-Helsinki/develop

Stage & Production 27.2.2024

composer.json

@@ -125,7 +125,7 @@
         "drupal/mail_login": "^3.0",
         "drupal/mailsystem": "^4.4",
         "drupal/markup": "^2",
-        "drupal/matomo": "^1.22",
+        "drupal/matomo": "^1.23",
         "drupal/maxlength": "^2.0@RC",
         "drupal/menu_item_fields": "^1.5",
         "drupal/message": "^1.2",
@@ -323,7 +323,8 @@
                 "Prevent unnecessary field attributes on forms": "patches/field-description-tooltip-prevent-unnecessary-attribute-casting.patch"
             },
             "drupal/eu_cookie_compliance": {
-                "Customizations to EU Cookie Compliance": "patches/eu_cookie_compliance_block-8.x-1.24.patch"
+                "Categories block": "patches/eu-cookie-compliance-categories-1.24.patch",
+                "Remove uglify and min JS": "patches/remove-uglify-and-min-js.patch"
             },
             "drupal/flag_lists": {
                 "https://www.drupal.org/project/flag_lists/issues/3395071#comment-15278458": "https://www.drupal.org/files/issues/2023-10-19/unflagging-event-error-3395071-2.patch"

config/sync/core.extension.yml

@@ -49,7 +49,6 @@ module:
   entity_reference_revisions: 0
   entitygroupfield: 0
   epp: 0
-  eu_cookie_compliance_matomo: 0
   eva: 0
   field: 0
   field_description_tooltip: 0
@@ -106,7 +105,6 @@ module:
   log_stdout: 0
   mail_login: 0
   markup: 0
-  matomo: 0
   maxlength: 0
   media: 0
   media_library: 0

config/sync/core.menu.static_menu_link_overrides.yml

@@ -14,3 +14,9 @@ definitions:
     weight: 0
     expanded: false
     enabled: false
+  user__page:
+    weight: 10
+    enabled: false
+    menu_name: account
+    parent: ''
+    expanded: false

config/sync/eu_cookie_compliance.settings.yml

@@ -57,13 +57,13 @@ better_support_for_screen_readers: false
 method: categories
 disabled_javascripts: ''
 automatic_cookies_removal: true
-allowed_cookies: 'essential_cookies:notificationMessagesClosed'
+allowed_cookies: "essential_cookies:notificationMessagesClosed\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*"
 consent_storage_method: do_not_store
 withdraw_message:
   value: "<p>We use cookies on this site to enhance your user experience</p>\r\n\r\n<p>You have given your consent for us to set cookies.</p>\r\n"
   format: filtered_html
 withdraw_tab_button_label: 'Privacy settings'
-withdraw_action_button_label: 'Withdraw consent'
+withdraw_action_button_label: 'Hylkää valinnat'
 withdraw_enabled: false
 withdraw_button_on_info_popup: false
 save_preferences_button_label: 'Hyväksy valinnat'

config/sync/language/en/views.view.cart.yml

@@ -25,7 +25,7 @@ display:
           label: Updated
         field_service_producer:
           label: 'Service provider'
-        field_service_time_and_location:
+        field_service_language:
           label: Language
       empty:
         area_text_custom:

config/sync/language/sv/views.view.cart.yml

@@ -23,7 +23,7 @@ display:
           label: Uppdaterat
         field_service_producer:
           label: Tjänsteproducent
-        field_service_time_and_location:
+        field_service_language:
           label: Språk
       empty:
         area_text_custom:

config/sync/views.view.cart.yml

@@ -5,13 +5,12 @@ dependencies:
   config:
     - core.entity_view_mode.node.view_card_lift
     - field.storage.node.field_description
+    - field.storage.node.field_service_language
     - field.storage.node.field_service_producer
-    - field.storage.node.field_service_time_and_location
     - flag.flag.cart
     - node.type.service
   module:
     - entity_print_views
-    - entity_reference_revisions
     - flag
     - node
     - user
@@ -626,10 +625,10 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        field_service_time_and_location:
-          id: field_service_time_and_location
-          table: node__field_service_time_and_location
-          field: field_service_time_and_location
+        field_service_language:
+          id: field_service_language
+          table: node__field_service_language
+          field: field_service_language
           relationship: none
           group_type: group
           admin_label: ''
@@ -676,10 +675,10 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: target_id
-          type: entity_reference_revisions_entity_view
+          type: entity_reference_label
           settings:
-            view_mode: limited_fields
-          group_column: ''
+            link: false
+          group_column: target_id
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -894,8 +893,8 @@ display:
         - 'user.node_grants:view'
         - user.permissions
       tags:
+        - 'config:field.storage.node.field_service_language'
         - 'config:field.storage.node.field_service_producer'
-        - 'config:field.storage.node.field_service_time_and_location'
   page_1:
     id: page_1
     display_title: Page