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

UHF-9755 Configuration replacement
City-of-Helsinki · Mar 25, 2024 · dd541fa · dd541fa
2 parents a073d47 + ffe58ac
commit dd541fa
Show file tree

Hide file tree

Showing 24 changed files with 75 additions and 30 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:
@@ -37,8 +38,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.helfi_hearings.helfi_hearings.default.yml b/conf/cmi/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - responsive_image.styles.gallery_thumbnail
+    - responsive_image.styles.image__3_2
   module:
     - external_entities
     - imagecache_external

diff --git a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml
@@ -29,9 +29,9 @@ content:
     weight: 0
     region: content
   list:
+    weight: 100
     settings: {  }
     third_party_settings: {  }
-    weight: 100
     region: content
 hidden:
   search_api_excerpt: 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
 id: paragraph.image.default
 targetEntityType: paragraph
 bundle: image

diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -118,6 +118,7 @@ module:
   paatokset_ahjo_api: 0
   paatokset_ahjo_openid: 0
   paatokset_ahjo_proxy: 0
+  paatokset_config: 0
   paatokset_council_info: 0
   paatokset_datapumppu: 0
   paatokset_helsinki_kanava: 0

diff --git a/conf/cmi/editoria11y.settings.yml b/conf/cmi/editoria11y.settings.yml
@@ -6,7 +6,7 @@ no_load: ''
 embedded_content_warning: ''
 download_links: ''
 ignore_link_strings: ''
+link_ignore_selector: 'svg.ext, svg.mailto, .link-purpose-text'
 hidden_handlers: ''
 ignore_containers: ''
 allow_overflow: ''
-link_ignore_selector: 'svg.ext, svg.mailto, .link-purpose-text'
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
@@ -6,8 +6,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
@@ -48,30 +48,30 @@ settings:
   handler: 'default:paragraph'
   handler_settings:
     target_bundles:
-      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
-      pdf_listing: pdf_listing
-      meetings_calendar: meetings_calendar
+      unit_search: unit_search
+      image: image
       accordion: accordion
+      meetings_calendar: meetings_calendar
+      pdf_listing: pdf_listing
       custom_content_links: custom_content_links
-      image: image
       text: text
     negate: 0
     target_bundles_drag_drop:

diff --git a/conf/cmi/field.field.paragraph.columns.field_columns_left_column.yml b/conf/cmi/field.field.paragraph.columns.field_columns_left_column.yml
@@ -13,7 +13,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

diff --git a/conf/cmi/field.field.paragraph.columns.field_columns_right_column.yml b/conf/cmi/field.field.paragraph.columns.field_columns_right_column.yml
@@ -13,7 +13,7 @@ id: paragraph.columns.field_columns_right_column
 field_name: field_columns_right_column
 entity_type: paragraph
 bundle: columns
-label: 'Oikea palsta'
+label: 'Right column'
 description: ''
 required: true
 translatable: false

diff --git a/conf/cmi/field.field.paragraph.list_of_links.field_list_of_links_links.yml b/conf/cmi/field.field.paragraph.list_of_links.field_list_of_links_links.yml
@@ -12,8 +12,8 @@ id: paragraph.list_of_links.field_list_of_links_links
 field_name: field_list_of_links_links
 entity_type: paragraph
 bundle: list_of_links
-label: Linkit
-description: 'Linkkilistan linkit.'
+label: Links
+description: 'The links that you want the paragraph to display.'
 required: true
 translatable: false
 default_value: {  }

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

diff --git a/public/modules/custom/paatokset_config/config/rewrite/metatag.metatag_defaults.global.yml b/public/modules/custom/paatokset_config/config/rewrite/metatag.metatag_defaults.global.yml
@@ -0,0 +1,4 @@
+config_rewrite:
+  replace: ['tags.title']
+tags:
+  title: '[current-page:title] | [site:name] | [site:page-title-suffix]'
diff --git a/public/modules/custom/paatokset_config/config/rewrite/metatag.metatag_defaults.node.yml b/public/modules/custom/paatokset_config/config/rewrite/metatag.metatag_defaults.node.yml
@@ -0,0 +1,4 @@
+config_rewrite:
+  replace: ['tags.title']
+tags:
+  title: '[node:title] | [site:name] | [site:page-title-suffix]'
diff --git a/...modules/custom/paatokset_config/config/rewrite/metatag.metatag_defaults.taxonomy_term.yml b/...modules/custom/paatokset_config/config/rewrite/metatag.metatag_defaults.taxonomy_term.yml
@@ -0,0 +1,4 @@
+config_rewrite:
+  replace: ['tags.title']
+tags:
+  title: '[term:name] | [site:name] | [site:page-title-suffix]'
diff --git a/public/modules/custom/paatokset_config/paatokset_config.info.yml b/public/modules/custom/paatokset_config/paatokset_config.info.yml
@@ -0,0 +1,5 @@
+name: 'Paatokset Config'
+type: module
+core_version_requirement: ^10
+dependencies:
+  - helfi_platform_config:helfi_platform_config
diff --git a/public/modules/custom/paatokset_config/paatokset_config.module b/public/modules/custom/paatokset_config/paatokset_config.module
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @file
+ * Contains alterations for config.
+ */
+
+declare(strict_types=1);
+
+use Drupal\config_rewrite\ConfigRewriterInterface;
+
+/**
+ * Implements hook_rewrite_config_update().
+ */
+function paatokset_config_rewrite_config_update(string $module, ConfigRewriterInterface $configRewriter): void {
+  $modules = [
+    'helfi_base_content',
+  ];
+
+  if (in_array($module, $modules)) {
+    // Rewrite module configuration.
+    $configRewriter->rewriteModuleConfig('paatokset_config');
+  }
+}