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

Dev to main
City-of-Helsinki · Jan 17, 2024 · 1a6df52 · 1a6df52
2 parents e5a99a4 + a2f17db
commit 1a6df52
Show file tree

Hide file tree

Showing 111 changed files with 894 additions and 686 deletions.
diff --git a/composer.json b/composer.json
@@ -29,6 +29,7 @@
         "drupal/raven": "^4.0",
         "drupal/redis": "^1.5",
         "drupal/stage_file_proxy": "^2.0",
+        "drupal/variationcache": "^1.4",
         "drush/drush": "^12.0"
     },
     "require-dev": {
@@ -45,9 +46,6 @@
         "weitzman/drupal-test-traits": "^2.1"
     },
     "conflict": {
-        "drupal/core": ">=10.2",
-        "drupal/core-composer-scaffold": ">=10.2",
-        "drupal/core-dev": ">=10.2",
         "drupal/drupal": "*"
     },
     "config": {
@@ -107,7 +105,8 @@
         },
         "patches": {
             "drupal/group": {
-                "https://www.drupal.org/project/group/issues/2815971": "https://www.drupal.org/files/issues/2023-06-13/group-context-2815971-46.patch"
+                "https://www.drupal.org/project/group/issues/2815971": "https://www.drupal.org/files/issues/2023-06-13/group-context-2815971-46.patch",
+                "Duplicate revision(version) tab around Group's admin pages": "https://www.drupal.org/files/issues/2023-12-12/group-revision-tabs-appear-twice-3397063-15.patch"
             },
             "drupal/group_content_menu": {
                 "https://www.drupal.org/project/group_content_menu/issues/3209011": "https://www.drupal.org/files/issues/2021-04-21/group_content_menu-active_trail_cache_problem-3209011-10.patch",

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml b/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml
@@ -3,6 +3,8 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.paragraph.unit_search.field_search_results_term
+    - field.field.paragraph.unit_search.field_search_results_terms
     - field.field.paragraph.unit_search.field_unit_search_description
     - field.field.paragraph.unit_search.field_unit_search_meta_button
     - field.field.paragraph.unit_search.field_unit_search_meta_label
@@ -21,6 +23,8 @@ third_party_settings:
         - field_unit_search_meta_label
         - field_unit_search_meta_placehold
         - field_unit_search_meta_button
+        - field_search_results_term
+        - field_search_results_terms
       label: 'Meta information'
       region: content
       parent_name: ''
@@ -33,12 +37,28 @@ third_party_settings:
         description: ''
         required_fields: true
 _core:
-  default_config_hash: z42RJh-JCLjD7_9W4B9_irn3nWHvqfSJ9foobt51Wg4
+  default_config_hash: fTziigwM99wtfwA2JFLTaxuwlbPXXLDZHA0WRTm14wU
 id: paragraph.unit_search.default
 targetEntityType: paragraph
 bundle: unit_search
 mode: default
 content:
+  field_search_results_term:
+    type: string_textfield
+    weight: 7
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_search_results_terms:
+    type: string_textfield
+    weight: 8
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   field_unit_search_description:
     type: text_textarea
     weight: 2

diff --git a/conf/cmi/core.entity_form_mode.media.media_library.yml b/conf/cmi/core.entity_form_mode.media.media_library.yml
@@ -11,5 +11,6 @@ _core:
   default_config_hash: pkq0uj-IoqEQRBOP_ddUDV0ZJ-dKQ_fLcppsEDF2UO8
 id: media.media_library
 label: 'Media library'
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_form_mode.user.register.yml b/conf/cmi/core.entity_form_mode.user.register.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: flXhTcp55yLcyy7ZLOhPGKGZobZQJdkAFVWV3LseiuI
 id: user.register
 label: Register
+description: ''
 targetEntityType: user
 cache: true
diff --git a/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml b/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml
@@ -3,6 +3,8 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.paragraph.unit_search.field_search_results_term
+    - field.field.paragraph.unit_search.field_search_results_terms
     - field.field.paragraph.unit_search.field_unit_search_description
     - field.field.paragraph.unit_search.field_unit_search_meta_button
     - field.field.paragraph.unit_search.field_unit_search_meta_label
@@ -13,12 +15,28 @@ dependencies:
   module:
     - text
 _core:
-  default_config_hash: eO2_M7ETTzd3irRYYwjAo3rKU54wDMxFzvHS3v6hKuQ
+  default_config_hash: S6K1S-j1nrFrLcfBOlDE6kLryR5LWMJb6vY4eDaS_G8
 id: paragraph.unit_search.default
 targetEntityType: paragraph
 bundle: unit_search
 mode: default
 content:
+  field_search_results_term:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 6
+    region: content
+  field_search_results_terms:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 7
+    region: content
   field_unit_search_description:
     type: text_default
     label: hidden

diff --git a/conf/cmi/core.entity_view_mode.block.token.yml b/conf/cmi/core.entity_view_mode.block.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - block
 id: block.token
 label: Token
+description: ''
 targetEntityType: block
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.file.token.yml b/conf/cmi/core.entity_view_mode.file.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - file
 id: file.token
 label: Token
+description: ''
 targetEntityType: file
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: q8QZDYrGHAdl67dw9Z1DdTCTIhOo3lpW0dGN70STnCk
 id: helfi_news.medium_teaser
 label: 'Medium Teaser'
+description: ''
 targetEntityType: helfi_news
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.content_card.yml b/conf/cmi/core.entity_view_mode.media.content_card.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: ZkAUzH7gBMP0I7VgZKkEsPYaKWHNjny_nb49e8n1HAE
 id: media.content_card
 label: 'Content card'
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.full.yml b/conf/cmi/core.entity_view_mode.media.full.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: 6NBUEuGmlkClK8Fb76tSMMpO2eZ4LWCBdbUk4z7CuP0
 id: media.full
 label: 'Full content'
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.hero.yml b/conf/cmi/core.entity_view_mode.media.hero.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: XHi0bUTi0UQU5CFI90xrtRS1tLLlwUSrMhNft4fY_XA
 id: media.hero
 label: Hero
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.image.yml b/conf/cmi/core.entity_view_mode.media.image.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: _B3q0O_xZZoTEPGo67JMyvbBEstnyqiAJjk8to3c1QM
 id: media.image
 label: Image
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.image_content_area.yml b/conf/cmi/core.entity_view_mode.media.image_content_area.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: u4xPVzzez1KP66PPTRiynkPmjXyIwJw6Nqjz01tLAjQ
 id: media.image_content_area
 label: 'Image (content area)'
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.list_of_links.yml b/conf/cmi/core.entity_view_mode.media.list_of_links.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: PHC5-ZAHrmao9xAd6ZMuFwwm9kIEBb4E31qjN0JkovE
 id: media.list_of_links
 label: 'List of Links'
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.media_library.yml b/conf/cmi/core.entity_view_mode.media.media_library.yml
@@ -11,5 +11,6 @@ _core:
   default_config_hash: pkq0uj-IoqEQRBOP_ddUDV0ZJ-dKQ_fLcppsEDF2UO8
 id: media.media_library
 label: 'Media library'
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.token.yml b/conf/cmi/core.entity_view_mode.media.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - media
 id: media.token
 label: Token
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.menu_link_content.token.yml b/conf/cmi/core.entity_view_mode.menu_link_content.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - menu_link_content
 id: menu_link_content.token
 label: Token
+description: ''
 targetEntityType: menu_link_content
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.card_teaser.yml b/conf/cmi/core.entity_view_mode.node.card_teaser.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: 6uymm4YPtiH6BS78cFHJaqx8rOGs3Dql7p5KHhSZUoc
 id: node.card_teaser
 label: 'Card Teaser'
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.diff.yml b/conf/cmi/core.entity_view_mode.node.diff.yml
@@ -12,5 +12,6 @@ _core:
   default_config_hash: pqZNtad5J9THcdbYjwPD4qINqvrTxnOd8KCWn6tUBRs
 id: node.diff
 label: 'Revision comparison'
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.full.yml b/conf/cmi/core.entity_view_mode.node.full.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: ElrtInxGjZd7GaapJ5O9n-ugi2hG2IxFivtgn0tHOsk
 id: node.full
 label: 'Full content'
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.medium_teaser.yml b/conf/cmi/core.entity_view_mode.node.medium_teaser.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: nfD5YCnsOB1VlfTq8e5AAzDeyGcGfwdoi0U6uHWYVM8
 id: node.medium_teaser
 label: 'Medium Teaser'
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.rss.yml b/conf/cmi/core.entity_view_mode.node.rss.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: vlYzr-rp2f9NMp-Qlr4sFjlqRq-90mco5-afLNGwCrU
 id: node.rss
 label: RSS
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.search_index.yml b/conf/cmi/core.entity_view_mode.node.search_index.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: fVFfJv_GzBRE-wpRHbfD5a3VjnhbEOXG6lvRd3uaccY
 id: node.search_index
 label: 'Search index'
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.search_result.yml b/conf/cmi/core.entity_view_mode.node.search_result.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: 6GCOQ-jP2RbdbHA5YWQ6bT8CfGbqrBYKOSC_XY4E3ZM
 id: node.search_result
 label: 'Search result highlighting input'
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.teaser.yml b/conf/cmi/core.entity_view_mode.node.teaser.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: Mz9qWr1kUYK0mjRAGDsr5XS6PvtZ24en_7ndt-pyWe4
 id: node.teaser
 label: Teaser
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.tiny_teaser.yml b/conf/cmi/core.entity_view_mode.node.tiny_teaser.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: esEvb8UT59th89qKzDjikljeeylxnQrNujTF310hPXY
 id: node.tiny_teaser
 label: 'Tiny Teaser'
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.token.yml b/conf/cmi/core.entity_view_mode.node.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - node
 id: node.token
 label: Token
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.paragraph.preview.yml b/conf/cmi/core.entity_view_mode.paragraph.preview.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: h3BeHVei4Lnyqbkao3YiF4KqoY-DhRvUNfEgKG8Rgjg
 id: paragraph.preview
 label: Preview
+description: ''
 targetEntityType: paragraph
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.paragraphs_library_item.summary.yml b/conf/cmi/core.entity_view_mode.paragraphs_library_item.summary.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: _YqHTUZ5t7SWq5sE0bJwbSNH9CaL_KIbwu-rURJ6sXo
 id: paragraphs_library_item.summary
 label: Summary
+description: ''
 targetEntityType: paragraphs_library_item
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.path_alias.token.yml b/conf/cmi/core.entity_view_mode.path_alias.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - path_alias
 id: path_alias.token
 label: Token
+description: ''
 targetEntityType: path_alias
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.taxonomy_term.full.yml b/conf/cmi/core.entity_view_mode.taxonomy_term.full.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: '-PPKjsNQPvoIDjOuUAvlLocYD976MNjb9Zpgyz5_BWE'
 id: taxonomy_term.full
 label: 'Taxonomy term page'
+description: ''
 targetEntityType: taxonomy_term
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.taxonomy_term.token.yml b/conf/cmi/core.entity_view_mode.taxonomy_term.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - taxonomy
 id: taxonomy_term.token
 label: Token
+description: ''
 targetEntityType: taxonomy_term
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.tpr_service.teaser.yml b/conf/cmi/core.entity_view_mode.tpr_service.teaser.yml
@@ -5,8 +5,9 @@ dependencies:
   module:
     - helfi_tpr
 _core:
-  default_config_hash: YOa_sO3NMdi35S6ah4CvX5AoLnX4zj2bxvL4-b6xv-8
+  default_config_hash: i_wjmDIqaBVX_NtJINMsSeUkcCwfmH8OsoB93VymSzU
 id: tpr_service.teaser
 label: Teaser
+description: ''
 targetEntityType: tpr_service
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml b/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml
@@ -5,8 +5,9 @@ dependencies:
   module:
     - helfi_tpr
 _core:
-  default_config_hash: YJXddqfHzgzWlN_oVmr77-vQmOPw1kMx9ZaqJQntc08
+  default_config_hash: Bck2wHrov_usRbEmhg9RWaK8Z0oIunYGSPSiqrtdsn8
 id: tpr_service.teaser_search_result
 label: 'Teaser search result'
+description: ''
 targetEntityType: tpr_service
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.comprehensive_school_card.yml b/conf/cmi/core.entity_view_mode.tpr_unit.comprehensive_school_card.yml
@@ -6,5 +6,6 @@ dependencies:
     - helfi_tpr
 id: tpr_unit.comprehensive_school_card
 label: 'Comprehensive school card'
+description: ''
 targetEntityType: tpr_unit
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.high_school_card.yml b/conf/cmi/core.entity_view_mode.tpr_unit.high_school_card.yml
@@ -6,5 +6,6 @@ dependencies:
     - helfi_tpr
 id: tpr_unit.high_school_card
 label: 'High school card'
+description: ''
 targetEntityType: tpr_unit
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_mode.tpr_unit.minimal.yml
@@ -5,8 +5,9 @@ dependencies:
   module:
     - helfi_tpr
 _core:
-  default_config_hash: QxDZ3nNixknhXrBxU6rSC1M5rvm5PeKB1Pj9ildFp-Q
+  default_config_hash: oC631SbwdCatNJWszkWAMTv-HhBr0SNctVNIuglNmRk
 id: tpr_unit.minimal
 label: Minimal
+description: ''
 targetEntityType: tpr_unit
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_mode.tpr_unit.teaser.yml
@@ -5,8 +5,9 @@ dependencies:
   module:
     - helfi_tpr
 _core:
-  default_config_hash: LAmS3Xr8vByI6fypZQ0FRSMklP5vCrEDqIj7XnQ7sRE
+  default_config_hash: TSNBB3UUcZstVdW5hFlz-fFEJYyVvdhfrmVqSA1yH-c
 id: tpr_unit.teaser
 label: Teaser
+description: ''
 targetEntityType: tpr_unit
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_mode.tpr_unit.teaser_with_image.yml
@@ -5,8 +5,9 @@ dependencies:
   module:
     - helfi_tpr
 _core:
-  default_config_hash: 5Z1tcWB9-xWDc1NdGMqEdBEztTkXqp-cX1daPPNuNaY
+  default_config_hash: AT-6ewVmv-w7sldP6bao9gCSTFtvUZOBaxEw8CUz0qc
 id: tpr_unit.teaser_with_image
 label: 'Teaser with image'
+description: ''
 targetEntityType: tpr_unit
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.token.yml b/conf/cmi/core.entity_view_mode.tpr_unit.token.yml
@@ -5,8 +5,9 @@ dependencies:
   module:
     - helfi_tpr
 _core:
-  default_config_hash: kzVXngjEGNpJsdD08ZS2eH18frDmMTMm5-s03cB3SMU
+  default_config_hash: e-6Lzi05F7EOEjvoo3YbLY-ig8Ha3dPyz8_FV5rl5fU
 id: tpr_unit.token
 label: Token
+description: ''
 targetEntityType: tpr_unit
 cache: true