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

Automatic update
City-of-Helsinki · Nov 2, 2022 · 66e5c29 · 66e5c29
2 parents 675af42 + d0f3549
commit 66e5c29
Show file tree

Hide file tree

Showing 16 changed files with 110 additions and 129 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml b/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml
@@ -44,12 +44,7 @@ content:
         collapse_edit_all: collapse_edit_all
         duplicate: duplicate
     third_party_settings: {  }
-  field_phasing_item_title_level:
-    type: options_select
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
+  field_phasing_item_title_level: {  }
   field_phasing_title_level:
     type: options_select
     weight: 0

diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml
@@ -16,8 +16,8 @@ content:
     type: imagecache_external_responsive_image
     label: hidden
     settings:
-      imagecache_external_responsive_style: gallery_thumbnail
       imagecache_external_link: ''
+      imagecache_external_responsive_style: gallery_thumbnail
     third_party_settings: {  }
     weight: 1
     region: content

diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml
@@ -18,8 +18,8 @@ content:
     type: imagecache_external_responsive_image
     label: hidden
     settings:
-      imagecache_external_responsive_style: gallery_thumbnail
       imagecache_external_link: ''
+      imagecache_external_responsive_style: gallery_thumbnail
     third_party_settings: {  }
     weight: 1
     region: content

diff --git a/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml b/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml
@@ -35,13 +35,6 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
-  field_phasing_item_title_level:
-    type: list_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
   field_phasing_title_level:
     type: list_key
     label: hidden

diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
@@ -155,8 +155,8 @@ content:
     type: imagecache_external_responsive_image
     label: hidden
     settings:
-      imagecache_external_responsive_style: image__3_2
       imagecache_external_link: ''
+      imagecache_external_responsive_style: image__3_2
     third_party_settings: {  }
     weight: 3
     region: content

diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
@@ -46,8 +46,8 @@ content:
     type: imagecache_external_responsive_image
     label: hidden
     settings:
-      imagecache_external_responsive_style: image__3_2
       imagecache_external_link: ''
+      imagecache_external_responsive_style: image__3_2
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
@@ -47,8 +47,8 @@ content:
     type: imagecache_external_responsive_image
     label: hidden
     settings:
-      imagecache_external_responsive_style: image__3_2
       imagecache_external_link: ''
+      imagecache_external_responsive_style: image__3_2
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
@@ -60,8 +60,8 @@ content:
     type: imagecache_external_responsive_image
     label: hidden
     settings:
-      imagecache_external_responsive_style: image__3_2
       imagecache_external_link: ''
+      imagecache_external_responsive_style: image__3_2
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -33,7 +33,6 @@ module:
   field_group: 0
   field_ui: 0
   file: 0
-  filelog: 0
   filter: 0
   flysystem: 0
   flysystem_azure: 0

diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml
@@ -74,3 +74,7 @@ cookie_value_disagreed: '0'
 cookie_value_agreed_show_thank_you: '1'
 cookie_value_agreed: '2'
 accessibility_focus: false
+close_button_action: close_banner
+reject_button_label: ''
+reject_button_enabled: false
+close_button_enabled: false
diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml
@@ -15,6 +15,7 @@ dependencies:
     - paragraphs.paragraphs_type.news_list
     - paragraphs.paragraphs_type.phasing
     - paragraphs.paragraphs_type.remote_video
+    - paragraphs.paragraphs_type.event_list
   module:
     - entity_reference_revisions
     - helfi_tpr
@@ -45,6 +46,7 @@ settings:
       liftup_with_image: liftup_with_image
       phasing: phasing
       news_list: news_list
+      event_list: event_list
     negate: 0
     target_bundles_drag_drop:
       accordion:
@@ -62,6 +64,9 @@ settings:
       content_cards:
         weight: -23
         enabled: true
+      event_list:
+        weight: 44
+        enabled: true
       from_library:
         weight: 21
         enabled: true

diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml
@@ -15,6 +15,7 @@ dependencies:
     - paragraphs.paragraphs_type.list_of_links
     - paragraphs.paragraphs_type.news_list
     - paragraphs.paragraphs_type.remote_video
+    - paragraphs.paragraphs_type.event_list
   module:
     - entity_reference_revisions
     - helfi_tpr
@@ -45,6 +46,7 @@ settings:
       liftup_with_image: liftup_with_image
       contact_card_listing: contact_card_listing
       news_list: news_list
+      event_list: event_list
     negate: 0
     target_bundles_drag_drop:
       accordion:
@@ -68,6 +70,9 @@ settings:
       content_cards:
         weight: -23
         enabled: true
+      event_list:
+        weight: 44
+        enabled: true
       from_library:
         weight: 21
         enabled: true

diff --git a/conf/cmi/filelog.settings.yml b/conf/cmi/filelog.settings.yml
diff --git a/conf/cmi/openid_connect.client.tunnistamo.yml b/conf/cmi/openid_connect.client.tunnistamo.yml
@@ -10,6 +10,7 @@ plugin: tunnistamo
 settings:
   client_id: placeholder
   client_secret: placeholder
+  iss_allowed_domains: ''
   is_production: 0
   auto_login: 0
   environment_url: 'https://tunnistamo.test.hel.ninja'

diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -221,8 +221,16 @@
     include __DIR__ . '/' . $env . '.settings.php';
   }
 
-  if (file_exists(__DIR__ . '/' . $env . '.services.yml')) {
-    $settings['container_yamls'][] = __DIR__ . '/' . $env . '.services.yml';
+  $servicesFiles = [
+    'services.yml',
+    'all.services.yml',
+    $env . '.services.yml',
+  ];
+
+  foreach ($servicesFiles as $fileName) {
+    if (file_exists(__DIR__ . '/' . $fileName)) {
+      $settings['container_yamls'][] = __DIR__ . '/' . $fileName;
+    }
   }
 
   if (getenv('OPENSHIFT_BUILD_NAMESPACE') && file_exists(__DIR__ . '/azure.settings.php')) {