Merge pull request #826 from City-of-Helsinki/UHF-9755

UHF-9755 Configuration replacement
City-of-Helsinki · Mar 21, 2024 · 935bdc9 · 935bdc9
2 parents a121add + d003c8a
commit 935bdc9
Show file tree

Hide file tree

Showing 19 changed files with 43 additions and 22 deletions.
diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/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

diff --git a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml b/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

diff --git a/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.paragraph.list_of_links_item.field_list_of_links_link
     - paragraphs.paragraphs_type.list_of_links_item
   module:
+    - hdbt_admin_tools
     - media_library
   enforced:
     module:
@@ -39,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

diff --git a/conf/cmi/core.entity_view_display.paragraph.image.default.yml b/conf/cmi/core.entity_view_display.paragraph.image.default.yml
@@ -7,6 +7,8 @@ dependencies:
     - field.field.paragraph.image.field_image_caption
     - field.field.paragraph.image.field_original_aspect_ratio
     - paragraphs.paragraphs_type.image
+  module:
+    - helfi_platform_config
 _core:
   default_config_hash: WOIjdvfdwRn0wIU-TyaRDV4PKTm77QLskpKljuLGk5Q
 id: paragraph.image.default

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -8,8 +8,8 @@ id: helfi_announcements
 label: 'Helfi: Announcements'
 label_plural: 'Helfi: Announcements'
 description: ''
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/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:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml
@@ -8,8 +8,8 @@ id: helfi_news
 label: 'Helfi: News'
 label_plural: 'Helfi: News'
 description: ''
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml
@@ -8,8 +8,8 @@ id: helfi_news_groups
 label: 'Helfi: News groups'
 label_plural: 'Helfi: News groups'
 description: 'Retrieves news groups taxonomy terms from Helfi'
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml
@@ -8,8 +8,8 @@ id: helfi_news_neighbourhoods
 label: 'Helfi: News neighbourhoods'
 label_plural: 'Helfi: News neighbourhoods'
 description: 'Retrieves news neighbourhoods taxonomy terms from Helfi'
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml
@@ -8,8 +8,8 @@ id: helfi_news_tags
 label: 'Helfi: News tags'
 label_plural: 'Helfi: News tags'
 description: 'Retrieves news tags taxonomy terms from Helfi'
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml
@@ -46,25 +46,25 @@ settings:
     target_bundles:
       district_and_project_search: district_and_project_search
       list_of_plans: list_of_plans
-      columns: columns
       list_of_links: list_of_links
       content_cards: content_cards
-      content_liftup: content_liftup
       banner: banner
       liftup_with_image: liftup_with_image
+      popular_services: popular_services
       from_library: from_library
-      chart: chart
-      remote_video: remote_video
-      map: map
-      news_list: news_list
-      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
+      news_list: news_list
       hearings: hearings
-      unit_search: unit_search
+      content_liftup: content_liftup
       service_list: service_list
       service_list_search: service_list_search
+      unit_search: unit_search
     negate: 0
     target_bundles_drag_drop:
       banner:

diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml
@@ -1,10 +1,10 @@
 _core:
   default_config_hash: OgPHnjkIjDn42IHAwLRXhNzdhX825gq2SrlYKw4kbQ8
 langcode: en
+path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json
 site_settings:
   default_icon: home-smoke
   theme_color: tram
   koro: vibration
 footer_settings:
   footer_color: dark
-path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json
diff --git a/conf/cmi/language/fi/views.view.user_admin_people.yml b/conf/cmi/language/fi/views.view.user_admin_people.yml
@@ -21,6 +21,8 @@ display:
           label: 'Käyttäjä jo'
         access:
           label: 'Viimeksi paikalla'
+          settings:
+            past_format: '@interval sitten'
         operations:
           label: Toimenpiteet
         mail:

diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml
@@ -1 +1 @@
-label: 'Contact card'
+label: Kontaktkort
diff --git a/conf/cmi/language/sv/views.view.files.yml b/conf/cmi/language/sv/views.view.files.yml
@@ -41,6 +41,9 @@ display:
           label: 'Datum för ändring'
         count:
           label: 'Används i'
+          alter:
+            path: 'admin/content/files/usage/{{ fid }}'
+          format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
       filters:
         filename:
           expose:
@@ -81,6 +84,7 @@ display:
           label: 'Registrerar modul'
         count:
           label: 'Antal använd'
+          format_plural_string: !!binary MQNAY291bnQ=
       title: Filanvändning
       arguments:
         fid:

diff --git a/conf/cmi/language/sv/views.view.paragraphs_library.yml b/conf/cmi/language/sv/views.view.paragraphs_library.yml
@@ -39,6 +39,8 @@ display:
           separator: ', '
         operations:
           label: Funktioner
+        count:
+          format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
       filters:
         label:
           expose:

diff --git a/conf/cmi/language/sv/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/sv/views.view.scheduler_scheduled_content.yml
@@ -63,6 +63,9 @@ display:
           expose:
             label: Språk
       title: 'Scheduled Content'
+      empty:
+        area_text_custom:
+          content: 'Inget schemalagt innehåll.'
     display_title: Förvald
   overview:
     display_options:
@@ -82,3 +85,4 @@ display:
           exception:
             title: Alla
     display_title: 'User profile tab'
+description: 'Hitta och hantera schemalagt innehåll.'
diff --git a/conf/cmi/language/sv/views.view.user_admin_people.yml b/conf/cmi/language/sv/views.view.user_admin_people.yml
@@ -19,8 +19,14 @@ display:
           label: Roller
         created:
           label: 'Medlem i'
+          settings:
+            future_format: '@interval'
+            past_format: '@interval'
         access:
           label: 'Senast åtkomst'
+          settings:
+            future_format: '@interval därav'
+            past_format: '@interval sedan'
         operations:
           label: Funktioner
         mail:

diff --git a/conf/cmi/views.view.media_library.yml b/conf/cmi/views.view.media_library.yml
@@ -1336,7 +1336,7 @@ display:
             image_link: ''
             image_style: media_library
             image_loading:
-              attribute: lazy
+              attribute: eager
         name:
           id: name
           table: media_field_data
@@ -1376,7 +1376,7 @@ display:
             custom_date_format: ''
             timezone: ''
             tooltip:
-              date_format: ''
+              date_format: long
               custom_date_format: ''
             time_diff:
               enabled: false