Dev to main

composer.json

@@ -14,7 +14,6 @@
         "drupal/core": "^10.0",
         "drupal/core-composer-scaffold": "^10.0",
         "drupal/draggableviews": "^2.0",
-        "drupal/elasticsearch_connector": "^7.0@alpha",
         "drupal/hdbt": "^6.0",
         "drupal/hdbt_admin": "^3.0",
         "drupal/helfi_azure_fs": "^2.0",
@@ -31,7 +30,6 @@
         "drupal/openapi_ui_redoc": "^1.0@RC",
         "drupal/radioactivity": "^4.0",
         "drupal/redis": "^1.5",
-        "drupal/search_api": "^1.23",
         "drupal/ultimate_cron": "^2.0@alpha",
         "drupal/views_rss": "^2.0@RC",
         "drush/drush": "^12",

conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml

@@ -9,6 +9,7 @@ dependencies:
     - paragraphs.paragraphs_type.contact_card_listing
     - paragraphs.paragraphs_type.content_cards
     - paragraphs.paragraphs_type.image
+    - paragraphs.paragraphs_type.image_gallery
     - paragraphs.paragraphs_type.liftup_with_image
     - paragraphs.paragraphs_type.list_of_links
     - paragraphs.paragraphs_type.map
@@ -47,6 +48,7 @@ settings:
       map: map
       sidebar_text: sidebar_text
       text: text
+      image_gallery: image_gallery
     negate: 0
     target_bundles_drag_drop:
       accordion:
@@ -67,6 +69,9 @@ settings:
       image:
         weight: 0
         enabled: true
+      image_gallery:
+        weight: 0
+        enabled: true
       liftup_with_image:
         weight: 0
         enabled: true

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

conf/cmi/core.entity_form_display.node.news_item.default.yml

@@ -19,13 +19,13 @@ dependencies:
   module:
     - field_group
     - hdbt_admin_tools
-    - helfi_annif
     - linkit
     - media_library
     - paragraphs
     - path
     - publication_date
     - radioactivity
+    - readonly_field_widget
     - scheduler
     - select2
 third_party_settings:
@@ -52,7 +52,7 @@ third_party_settings:
       label: Links
       region: content
       parent_name: ''
-      weight: 20
+      weight: 18
       format_type: fieldset
       format_settings:
         classes: ''
@@ -67,7 +67,7 @@ third_party_settings:
       label: 'Main image'
       region: content
       parent_name: ''
-      weight: 17
+      weight: 16
       format_type: details
       format_settings:
         classes: ''
@@ -93,9 +93,9 @@ third_party_settings:
         required_fields: false
     group_automatically_recommended:
       children:
-        - annif_suggested_topics
         - in_recommendations
         - show_annif_block
+        - annif_keywords
       label: 'Automatically recommended content'
       region: content
       parent_name: ''
@@ -116,7 +116,7 @@ mode: default
 content:
   annif_suggested_topics:
     type: suggested_topics_reference
-    weight: 29
+    weight: 26
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -128,7 +128,7 @@ content:
     third_party_settings: {  }
   field_content:
     type: paragraphs
-    weight: 18
+    weight: 17
     region: content
     settings:
       title: Paragraph
@@ -147,7 +147,7 @@ content:
     third_party_settings: {  }
   field_lead_in:
     type: string_textarea
-    weight: 16
+    weight: 15
     region: content
     settings:
       rows: 5
@@ -198,7 +198,7 @@ content:
     third_party_settings: {  }
   field_news_item_tags:
     type: select2_entity_reference
-    weight: 21
+    weight: 19
     region: content
     settings:
       width: 100%
@@ -252,7 +252,7 @@ content:
     third_party_settings: {  }
   in_recommendations:
     type: boolean_checkbox
-    weight: 30
+    weight: 0
     region: content
     settings:
       display_label: true
@@ -279,7 +279,7 @@ content:
     third_party_settings: {  }
   publish_on:
     type: datetime_timestamp_no_default
-    weight: 12
+    weight: 11
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -296,7 +296,7 @@ content:
     third_party_settings: {  }
   show_annif_block:
     type: boolean_checkbox
-    weight: 31
+    weight: 1
     region: content
     settings:
       display_label: true
@@ -309,13 +309,13 @@ content:
       display_label: true
     third_party_settings: {  }
   simple_sitemap:
-    weight: 11
+    weight: 10
     region: content
     settings: {  }
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 15
+    weight: 14
     region: content
     settings:
       display_label: true
@@ -352,12 +352,12 @@ content:
     third_party_settings: {  }
   unpublish_on:
     type: datetime_timestamp_no_default
-    weight: 13
+    weight: 12
     region: content
     settings: {  }
     third_party_settings: {  }
   url_redirects:
-    weight: 14
+    weight: 13
     region: content
     settings: {  }
     third_party_settings: {  }

conf/cmi/core.entity_form_display.paragraph.image_gallery.default.yml

@@ -0,0 +1,65 @@
+uuid: 6f54e74d-5553-4ba9-beb0-af843b204fed
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.image_gallery.field_gallery_item
+    - field.field.paragraph.image_gallery.field_image_gallery_description
+    - field.field.paragraph.image_gallery.field_image_gallery_ratio
+    - field.field.paragraph.image_gallery.field_image_gallery_title
+    - paragraphs.paragraphs_type.image_gallery
+  module:
+    - paragraphs
+    - text
+_core:
+  default_config_hash: ClzrSrZjVhACSX9k5LALozrSm5gLuFEvOURBKAlRbvs
+id: paragraph.image_gallery.default
+targetEntityType: paragraph
+bundle: image_gallery
+mode: default
+content:
+  field_gallery_item:
+    type: paragraphs
+    weight: 3
+    region: content
+    settings:
+      title: Paragraph
+      title_plural: Paragraphs
+      edit_mode: closed
+      closed_mode: summary
+      autocollapse: none
+      closed_mode_threshold: 0
+      add_mode: dropdown
+      form_display_mode: default
+      default_paragraph_type: image_gallery_item
+      features:
+        add_above: '0'
+        collapse_edit_all: collapse_edit_all
+        convert: '0'
+        duplicate: duplicate
+    third_party_settings: {  }
+  field_image_gallery_description:
+    type: text_textarea
+    weight: 1
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  field_image_gallery_ratio:
+    type: options_select
+    weight: 2
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_image_gallery_title:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  created: true
+  status: true

conf/cmi/core.entity_form_display.paragraph.image_gallery_item.default.yml

@@ -0,0 +1,38 @@
+uuid: ac59cef5-11ea-4ffa-8550-29adbac16965
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.image_gallery_item.field_gallery_image
+    - field.field.paragraph.image_gallery_item.field_gallery_image_description
+    - paragraphs.paragraphs_type.image_gallery_item
+  module:
+    - hdbt_admin_tools
+    - media_library
+_core:
+  default_config_hash: We454Hg-JKGKzTEuGiPpn1di6JpllvY96zuvVNeMX1I
+id: paragraph.image_gallery_item.default
+targetEntityType: paragraph
+bundle: image_gallery_item
+mode: default
+content:
+  field_gallery_image:
+    type: media_library_widget
+    weight: 0
+    region: content
+    settings:
+      media_types: {  }
+    third_party_settings: {  }
+  field_gallery_image_description:
+    type: textfield_character_counter
+    weight: 2
+    region: content
+    settings:
+      counter_step: 0
+      counter_total: 160
+      size: 160
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  created: true
+  status: true

conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml

@@ -14,7 +14,7 @@ dependencies:
     - media_library
     - text
 _core:
-  default_config_hash: AMDZDzWNP90sUgt9bSZf2RbL7KmSxkXMKIiueo1JSWg
+  default_config_hash: VflHWgcqxxjyQ5dI9XiXzqbtlh7Pl2_qqR3bz8Zj1jg
 id: paragraph.remote_video.default
 targetEntityType: paragraph
 bundle: remote_video

conf/cmi/core.entity_view_display.media.image.image_gallery.yml

@@ -0,0 +1,38 @@
+uuid: 276c125d-e2db-44ce-9576-21c45385e0dc
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.media.image_gallery
+    - field.field.media.image.field_media_image
+    - field.field.media.image.field_photographer
+    - media.type.image
+    - responsive_image.styles.image_gallery_1_1
+  module:
+    - responsive_image
+_core:
+  default_config_hash: Ky7rUnc3u7APd8dH1E5EogiDjUtvkJvq0ZHfgG6OlQw
+id: media.image.image_gallery
+targetEntityType: media
+bundle: image
+mode: image_gallery
+content:
+  field_media_image:
+    type: responsive_image
+    label: hidden
+    settings:
+      responsive_image_style: image_gallery_1_1
+      image_link: ''
+      image_loading:
+        attribute: eager
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  created: true
+  field_photographer: true
+  langcode: true
+  name: true
+  search_api_excerpt: true
+  thumbnail: true
+  uid: true

conf/cmi/core.entity_view_display.paragraph.image_gallery.default.yml

@@ -0,0 +1,54 @@
+uuid: 4634b6de-c88e-4454-97b2-5333a9f68c5d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.image_gallery.field_gallery_item
+    - field.field.paragraph.image_gallery.field_image_gallery_description
+    - field.field.paragraph.image_gallery.field_image_gallery_ratio
+    - field.field.paragraph.image_gallery.field_image_gallery_title
+    - paragraphs.paragraphs_type.image_gallery
+  module:
+    - entity_reference_revisions
+    - options
+    - text
+_core:
+  default_config_hash: K6JQi5u8Iwe6KYzLnjn5Mk9HBBXE3P0KHemD_OxmcU8
+id: paragraph.image_gallery.default
+targetEntityType: paragraph
+bundle: image_gallery
+mode: default
+content:
+  field_gallery_item:
+    type: entity_reference_revisions_entity_view
+    label: hidden
+    settings:
+      view_mode: default
+      link: ''
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  field_image_gallery_description:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  field_image_gallery_ratio:
+    type: list_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  field_image_gallery_title:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true