Merge pull request #1034 from City-of-Helsinki/dev

Dev to main
City-of-Helsinki · Feb 12, 2025 · a418147 · a418147
2 parents cca2aca + 40b5946
commit a418147
Show file tree

Hide file tree

Showing 29 changed files with 241 additions and 194 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/core.extension.yml b/conf/cmi/core.extension.yml
@@ -100,6 +100,7 @@ module:
   inline_form_errors: 0
   jquery_ui: 0
   jquery_ui_draggable: 0
+  js_cookie: 0
   key: 0
   language: 0
   link: 0

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.field.media.image.field_media_image.yml b/conf/cmi/field.field.media.image.field_media_image.yml
@@ -15,7 +15,7 @@ third_party_settings:
       title: title
       file: '0'
 _core:
-  default_config_hash: uuOLryur4r1samXCVX2yDZ5xFTBOK5d5vtciBb0wMBk
+  default_config_hash: sqUCzZKbsacNIaBSbqEOIYmTe71GQajeaFPNIVlSXVE
 id: media.image.field_media_image
 field_name: field_media_image
 entity_type: media
@@ -30,7 +30,7 @@ settings:
   handler: 'default:file'
   handler_settings: {  }
   file_directory: ''
-  file_extensions: 'png gif jpg jpeg'
+  file_extensions: 'png jpg jpeg'
   max_filesize: ''
   max_resolution: ''
   min_resolution: ''

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/language/fi/views.view.files.yml b/conf/cmi/language/fi/views.view.files.yml
@@ -41,6 +41,7 @@ display:
           label: Muutospäivämäärä
         count:
           label: Käytetään
+          format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
       filters:
         filename:
           expose:

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/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml
@@ -91,6 +91,7 @@ display:
         type: mini
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 10
           total_pages: null
           id: 0
@@ -105,7 +106,6 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml
@@ -381,6 +381,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 50
           total_pages: null
           id: 0
@@ -398,7 +399,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml
@@ -381,6 +381,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 50
           total_pages: null
           id: 0
@@ -398,7 +399,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
@@ -109,6 +109,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 4
           total_pages: null
           id: 0
@@ -126,7 +127,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:
@@ -646,6 +646,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 5
           total_pages: null
           id: 0
@@ -663,7 +664,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml
@@ -93,6 +93,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 8
           total_pages: null
           id: 0
@@ -110,7 +111,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml
@@ -286,6 +286,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 15
           total_pages: null
           id: 0
@@ -303,7 +304,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options: