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

Automatic update
City-of-Helsinki · Dec 21, 2023 · a15ccff · a15ccff
2 parents 015f468 + 0cc493f
commit a15ccff
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 27 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -9,16 +9,17 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_metatags
     - field.field.tpr_unit.tpr_unit.field_unit_type
   module:
+    - allowed_formats
     - hdbt_admin_tools
     - helfi_tpr
     - media_library
     - metatag
     - paragraphs
     - path
     - readonly_field_widget
-    - select2
+    - text
 _core:
-  default_config_hash: iGJgv-B14-RUdc8dyC_MKfM3icDg5Cae4kFwC0MjyGQ
+  default_config_hash: ilRrdsHOQ6StmQoz8EXvQCOoYTo8L_o2ZG8gNzEbtZM
 id: tpr_unit.tpr_unit.default
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -56,7 +57,7 @@ content:
     third_party_settings: {  }
   address:
     type: readonly_field_widget
-    weight: 19
+    weight: 20
     region: content
     settings:
       label: above
@@ -114,6 +115,17 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
+  enrich_description:
+    type: text_textarea
+    weight: 19
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings:
+      allowed_formats:
+        hide_help: '1'
+        hide_guidelines: '1'
   field_content:
     type: paragraphs
     weight: 28
@@ -142,7 +154,7 @@ content:
       autocomplete: false
       match_operator: STARTS_WITH
       match_limit: 10
-    third_party_settings: {  }
+    third_party_settings: { }
   field_lower_content:
     type: paragraphs
     weight: 29

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
@@ -19,7 +19,7 @@ dependencies:
     - telephone
     - text
 _core:
-  default_config_hash: 7xcZTrrfS31z_AAdwrXSDrgd2PAqTWFPgY-XoAEjXQ0
+  default_config_hash: SoKM8cPSwNeMsP8ZRG0b8B8n-e1Uy9yoMmPk018vmoY
 id: tpr_unit.tpr_unit.default
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -104,6 +104,13 @@ content:
     third_party_settings: {  }
     weight: 8
     region: content
+  enrich_description:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
   field_content:
     type: entity_reference_revisions_entity_view
     label: hidden

diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
@@ -13,7 +13,7 @@ dependencies:
     - address
     - helfi_tpr
 _core:
-  default_config_hash: wvPWnthIC7o8oa1gJ6jI0ex6xi12GVsZEN5zyrlCLoU
+  default_config_hash: f5AGkO_5_TgZ9InGKOLMyzbGFaCCTKeiPJYeGuTLnq0
 id: tpr_unit.tpr_unit.minimal
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -53,6 +53,7 @@ hidden:
   created: true
   description: true
   email: true
+  enrich_description: true
   field_content: true
   field_districts: true
   field_lower_content: true

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
@@ -15,7 +15,7 @@ dependencies:
     - helfi_tpr
     - imagecache_external
 _core:
-  default_config_hash: 8hru5uh55ouZ9y4kV_EEJ6PEjb2rGY_tFUc_3Sn12M0
+  default_config_hash: 6HvSNKVwbTTTZp-QqRhArKx-A-rx42QloU6l9LZG9rQ
 id: tpr_unit.tpr_unit.teaser
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -73,6 +73,7 @@ hidden:
   created: true
   description: true
   email: true
+  enrich_description: true
   field_content: true
   field_districts: true
   field_lower_content: true

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
@@ -16,7 +16,7 @@ dependencies:
     - imagecache_external
     - telephone
 _core:
-  default_config_hash: gOlhIa1n9jTIJdBPN_Kjp-jn3YnsvZb7HELaoqa8KGQ
+  default_config_hash: 7gCaVLldtjbDLtOqHqBK6K1NqvNzluQEbJG5bn945k4
 id: tpr_unit.tpr_unit.teaser_with_image
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -74,6 +74,7 @@ hidden:
   created: true
   description: true
   email: true
+  enrich_description: true
   field_content: true
   field_districts: true
   field_lower_content: true

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
@@ -16,7 +16,7 @@ dependencies:
     - imagecache_external
     - telephone
 _core:
-  default_config_hash: 25YiuMfsdqG-daKeTND6nbYvwDgt7kE7bw23g2GyteI
+  default_config_hash: 0wDMf9-yI6dKb0je5d0tNyKMNCX5FmuYbFxMRzGs1kc
 id: tpr_unit.tpr_unit.wide_teaser
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -89,6 +89,7 @@ hidden:
   created: true
   description: true
   email: true
+  enrich_description: true
   field_content: true
   field_districts: true
   field_lower_content: true

diff --git a/conf/cmi/language/fi/views.view.unit_search.yml b/conf/cmi/language/fi/views.view.unit_search.yml
@@ -17,6 +17,11 @@ display:
           expose:
             label: Etsi
             placeholder: 'Syötä toimipisteen nimi tai osoite'
+      fields:
+        name: {  }
+        address__postal_code: {  }
+        address__address_line1: {  }
+        address__address_line2: {  }
       pager:
         options:
           tags:
@@ -48,4 +53,9 @@ display:
     display_title: Lohko
   entity_reference:
     display_title: Entiteettiviittaus
+    display_options:
+      fields:
+        name_override: {  }
+        id: {  }
+        name: {  }
 label: Toimipistehaku
diff --git a/conf/cmi/language/sv/views.view.unit_search.yml b/conf/cmi/language/sv/views.view.unit_search.yml
@@ -2,6 +2,11 @@ display:
   default:
     display_title: Förvald
     display_options:
+      fields:
+        name: {  }
+        address__postal_code: {  }
+        address__address_line1: {  }
+        address__address_line2: {  }
       pager:
         options:
           tags:
@@ -44,5 +49,11 @@ display:
           group_info:
             label: 'Kombinera filterfält'
             description: ''
+  block: {  }
   entity_reference:
     display_title: Objektsreferens
+    display_options:
+      fields:
+        name_override: {  }
+        id: {  }
+        name: {  }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,6 +29,7 @@ services:
       SIMPLETEST_BASE_URL: "http://app:8888"
       SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
       BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}"
+      BROWSERTEST_OUTPUT_DIRECTORY: "/app/public/sites/default/files/simpletest"
       DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish"
       DRUPAL_VARNISH_PORT: 6081
       REDIS_HOST: redis