Merge pull request #1039 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Feb 6, 2025 · d26398a · d26398a
2 parents 91d034a + 0dea0bf
commit d26398a
Show file tree

Hide file tree

Showing 16 changed files with 59 additions and 67 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.media.helfi_chart.default.yml b/conf/cmi/core.entity_form_display.media.helfi_chart.default.yml
@@ -11,7 +11,7 @@ dependencies:
     - link
     - text
 _core:
-  default_config_hash: gdwGWJ777jQK9Sp9u3B8_ezV69VGMbEqOiKax-7vUM8
+  default_config_hash: RPiB_poa2hBtdepgZvpwegxerpRhNyCkRIr_OEt_l-M
 id: media.helfi_chart.default
 targetEntityType: media
 bundle: helfi_chart

diff --git a/conf/cmi/core.entity_form_display.media.helfi_chart.media_library.yml b/conf/cmi/core.entity_form_display.media.helfi_chart.media_library.yml
@@ -11,7 +11,7 @@ dependencies:
   module:
     - text
 _core:
-  default_config_hash: 15dE9cINIClD6CbC9j7i4xZaZ4eI95MVmLKSkvXb1P4
+  default_config_hash: 7I7JgqwSLHKPVnnYpmVSQ0-RS8tUb0ayNGVynJiS_Jg
 id: media.helfi_chart.media_library
 targetEntityType: media
 bundle: helfi_chart

diff --git a/conf/cmi/core.entity_view_display.media.helfi_chart.default.yml b/conf/cmi/core.entity_view_display.media.helfi_chart.default.yml
@@ -8,10 +8,10 @@ dependencies:
     - field.field.media.helfi_chart.field_helfi_chart_url
     - media.type.helfi_chart
   module:
-    - helfi_media_chart
+    - link
     - text
 _core:
-  default_config_hash: 1xd_Ay1Sm-oy3t_qPIo9gRcIHleOgRxGwiLk41gA6Yw
+  default_config_hash: FUv-BgecAAz5WBHKaQdV8sD8uNcYSfMUOpMez76--HA
 id: media.helfi_chart.default
 targetEntityType: media
 bundle: helfi_chart
@@ -33,9 +33,14 @@ content:
     weight: 2
     region: content
   field_helfi_chart_url:
-    type: helfi_chart
+    type: link
     label: hidden
-    settings: {  }
+    settings:
+      trim_length: 80
+      url_only: true
+      url_plain: false
+      rel: ''
+      target: ''
     third_party_settings: {  }
     weight: 1
     region: content

diff --git a/conf/cmi/core.entity_view_display.media.helfi_chart.media_library.yml b/conf/cmi/core.entity_view_display.media.helfi_chart.media_library.yml
@@ -11,7 +11,7 @@ dependencies:
   module:
     - helfi_media_chart
 _core:
-  default_config_hash: FHz7mlEZIIXRsyZiI6EMFXkkmC4Qtdt1d4kzEN_fSY0
+  default_config_hash: 28nwEZaRGXg0zD-nmyYusiqAx3gMir52iQG7f5pcyJM
 id: media.helfi_chart.media_library
 targetEntityType: media
 bundle: helfi_chart

diff --git a/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_title.yml b/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_title.yml
@@ -6,7 +6,7 @@ dependencies:
     - field.storage.media.field_helfi_chart_title
     - media.type.helfi_chart
 _core:
-  default_config_hash: NkVp00nT1XM4LgzHMR5KpcZejQka35JJzP47xH7r1yE
+  default_config_hash: 1-AJXcAy0ANS-0BXwAAz8RiB9_s6MfjOP7Mh02yl1X4
 id: media.helfi_chart.field_helfi_chart_title
 field_name: field_helfi_chart_title
 entity_type: media

diff --git a/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_transcript.yml b/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_transcript.yml
@@ -13,7 +13,7 @@ third_party_settings:
     allowed_formats:
       - minimal
 _core:
-  default_config_hash: eYXYJE9ziG8ujmLaO266WejbGDf4DUbUQU6QJac4zXY
+  default_config_hash: 59V-xqzI9H6QWi8JxWcfumBdgctyJuIKKQwy-fIz8xA
 id: media.helfi_chart.field_helfi_chart_transcript
 field_name: field_helfi_chart_transcript
 entity_type: media

diff --git a/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_url.yml b/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_url.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - link
 _core:
-  default_config_hash: V1HwyhpRiVfBUpG1VW9xYqhX2nyWcObeJLStCHAWJ0U
+  default_config_hash: fLnEZJ-Xn6hrPAbX1Rm-QF5wD7iFzgfGYmC7ZHQb3Uo
 id: media.helfi_chart.field_helfi_chart_url
 field_name: field_helfi_chart_url
 entity_type: media

diff --git a/conf/cmi/field.storage.media.field_helfi_chart_title.yml b/conf/cmi/field.storage.media.field_helfi_chart_title.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - media
 _core:
-  default_config_hash: yLiblI3eUbV0Sc4-XQIRmuXcC_86RLrjM1x7hpE7sgM
+  default_config_hash: E9vNuq40qcDWpbVXzhJZIT-bS2dY1UtXzBLkSzXX5cM
 id: media.field_helfi_chart_title
 field_name: field_helfi_chart_title
 entity_type: media

diff --git a/conf/cmi/field.storage.media.field_helfi_chart_transcript.yml b/conf/cmi/field.storage.media.field_helfi_chart_transcript.yml
@@ -6,7 +6,7 @@ dependencies:
     - media
     - text
 _core:
-  default_config_hash: uqaIgIT9IhvV9B6Q2Lv7oC-6c3Tdc6DKqKrL5tenzWE
+  default_config_hash: XBAZ5mxW37dvu50a4J6YRsS1nIMmSrrbp6o123TjEPU
 id: media.field_helfi_chart_transcript
 field_name: field_helfi_chart_transcript
 entity_type: media

diff --git a/conf/cmi/field.storage.media.field_helfi_chart_url.yml b/conf/cmi/field.storage.media.field_helfi_chart_url.yml
@@ -6,7 +6,7 @@ dependencies:
     - link
     - media
 _core:
-  default_config_hash: 5_rvFqrv3gOFWntv-K-YqlVVzLGf2qMtMHNV5JRlOAQ
+  default_config_hash: TFCN5mPRa-KucnPSitp_Q9YBEVittmV1k3IB-cdhq6I
 id: media.field_helfi_chart_url
 field_name: field_helfi_chart_url
 entity_type: media

diff --git a/conf/cmi/language.content_settings.media.helfi_chart.yml b/conf/cmi/language.content_settings.media.helfi_chart.yml
@@ -5,7 +5,7 @@ dependencies:
   config:
     - media.type.helfi_chart
 _core:
-  default_config_hash: 2BVN4f7oVA6fKcWq9zF90vKpBQ122PgyhnrbvoSn_gk
+  default_config_hash: Ohvg1161oVX8a2EjOkWgQumATkIUd0YaZeQfqCSZ-d8
 id: media.helfi_chart
 target_entity_type_id: media
 target_bundle: helfi_chart

diff --git a/conf/cmi/media.type.helfi_chart.yml b/conf/cmi/media.type.helfi_chart.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - helfi_media_chart
 _core:
-  default_config_hash: 1503jEWhXt0uww_73X1tsvrKBnZlbrduYrVR0J4IugA
+  default_config_hash: fE_5vzXaso2zcPNu6y4-ltGFLCUYWlG98COd3d7SbIk
 id: helfi_chart
 label: 'Chart embed'
 description: 'Media type Chart can be used to present interactive charts. Supports Microsoft Power BI.'

diff --git a/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--journey-planner.html.twig b/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--journey-planner.html.twig
@@ -9,14 +9,16 @@
   %}
     {% block component_content %}
 
-      {% set after_planner_id = media_id ~ random() ~ '-after'|clean_id %}
-      {% set before_planner_id = media_id ~ random() ~ '-before'|clean_id %}
+      {% set skip_link_after = media_id ~ random() ~ '-after'|clean_id %}
+      {% set skip_link_before = media_id ~ random() ~ '-before'|clean_id %}
+      {% set cookie_consent_groups = ['preferences', 'statistics'] %}
 
       {% include '@hdbt/misc/embedded-content-cookie-compliance.twig' with {
         media_url: media_url,
         media_id: media_id,
         media_service_url: media_service_url,
         privacy_policy_url: privacy_policy_url,
+        cookie_consent_groups: cookie_consent_groups,
       } %}
 
       {% set drupal_settings = {
@@ -27,8 +29,9 @@
                 'src': media_url,
                 'title': 'Digitransit UI embedded search'|t({}, {'context': 'Journey planner'}),
                 'type': 'journey_planner',
-                'skipLinkAfterId' : after_planner_id,
-                'skipLinkBeforeId' : before_planner_id,
+                'skipLinkAfterId' : skip_link_after,
+                'skipLinkBeforeId' : skip_link_before,
+                'cookieConsentGroups' : cookie_consent_groups,
               }
             }
           }
@@ -39,4 +42,4 @@
 
     {% endblock component_content %}
   {% endembed %}
-{% endblock paragraph %}
+{% endblock paragraph %}
diff --git a/public/themes/custom/hdbt_subtheme/translations/fi.po b/public/themes/custom/hdbt_subtheme/translations/fi.po
@@ -23,14 +23,6 @@ msgctxt "Journey planner"
 msgid "Digitransit UI embedded search"
 msgstr "Digitransit UI upotettu haku"
 
-msgctxt "Skip link after the journey planner for the journey planner paragraph"
-msgid "Continue above the journey planner"
-msgstr "Siirry reittioppaan yläpuolelle"
-
-msgctxt "Skip link before the journey planner for the journey planner paragraph"
-msgid "Continue below the journey planner"
-msgstr "Siirry reittioppaan alapuolelle"
-
 msgctxt "District and project search fallback"
 msgid "search result"
 msgid_plural "search results"

diff --git a/public/themes/custom/hdbt_subtheme/translations/sv.po b/public/themes/custom/hdbt_subtheme/translations/sv.po
@@ -23,14 +23,6 @@ msgctxt "Journey planner"
 msgid "Digitransit UI embedded search"
 msgstr "Digitransit UI inbäddad sökning"
 
-msgctxt "Skip link after the journey planner for the journey planner paragraph"
-msgid "Continue above the journey planner"
-msgstr "Gå förbi reseplaneraren uppåt"
-
-msgctxt "Skip link before the journey planner for the journey planner paragraph"
-msgid "Continue below the journey planner"
-msgstr "Gå förbi reseplaneraren nedåt"
-
 msgctxt "District and project search fallback"
 msgid "search result"
 msgid_plural "search results"