Dev to main

composer.json

@@ -101,9 +101,6 @@
                 "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": {
-                "Fix for a whitescreen caused by merging array with null.": "patches/group_menu_content_array_concat_error.patch"
-            },
             "drupal/override_node_options": {
                 "Fix for adding non-existent permissions to a role is not allowed error during site install.": "patches/override_node_permissions_missing_dependencies.patch"
             }

conf/cmi/block.block.helfirecommendationsblock.yml

@@ -35,7 +35,6 @@ visibility:
     context_mapping:
       node: '@node.node_route_context:node'
     bundles:
-      landing_page: landing_page
       news_article: news_article
       news_item: news_item
       page: page

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

@@ -11,7 +11,6 @@ dependencies:
     - node.type.landing_page
   module:
     - hdbt_admin_tools
-    - helfi_recommendations
     - media_library
     - metatag
     - paragraphs

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

@@ -4,11 +4,9 @@ status: true
 dependencies:
   config:
     - field.field.paragraph.contact_card.field_contact_description
-    - field.field.paragraph.contact_card.field_contact_image
     - field.field.paragraph.contact_card.field_contact_image_photographer
     - field.field.paragraph.contact_card.field_contact_image_reference
     - field.field.paragraph.contact_card.field_contact_name
-    - field.field.paragraph.contact_card.field_contact_social_media
     - field.field.paragraph.contact_card.field_contact_social_media_link
     - field.field.paragraph.contact_card.field_contact_title
     - field.field.paragraph.contact_card.field_email
@@ -17,10 +15,9 @@ dependencies:
   module:
     - link
     - media_library
-    - paragraphs
     - telephone
 _core:
-  default_config_hash: 9GMOG_QIuNk11PXYGJk8symwR8u84uGQZlRFHhgclTk
+  default_config_hash: xjbHYsHPxl1_konqxWI_VZ9Mmffc6T3cw-bIKWdiPVQ
 id: paragraph.contact_card.default
 targetEntityType: paragraph
 bundle: contact_card
@@ -49,24 +46,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_contact_social_media:
-    type: paragraphs
-    weight: 6
-    region: content
-    settings:
-      title: Paragraph
-      title_plural: Paragraphs
-      edit_mode: open
-      closed_mode: summary
-      autocollapse: none
-      closed_mode_threshold: 0
-      add_mode: dropdown
-      form_display_mode: default
-      default_paragraph_type: ''
-      features:
-        collapse_edit_all: collapse_edit_all
-        duplicate: duplicate
-    third_party_settings: {  }
   field_contact_social_media_link:
     type: link_default
     weight: 7
@@ -100,6 +79,5 @@ content:
     third_party_settings: {  }
 hidden:
   created: true
-  field_contact_image: true
   field_contact_image_photographer: true
   status: true

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

@@ -4,31 +4,41 @@ status: true
 dependencies:
   config:
     - field.field.paragraph.content_cards.field_content_cards_content
+    - field.field.paragraph.content_cards.field_content_cards_desc
     - field.field.paragraph.content_cards.field_content_cards_design
     - field.field.paragraph.content_cards.field_content_cards_title
     - paragraphs.paragraphs_type.content_cards
   module:
     - hdbt_admin_tools
+    - text
 _core:
-  default_config_hash: rc8JKN-XvjAFkper1mY1JSFNvuAlde6tGnPVFI4xGq8
+  default_config_hash: 4JX8v7Gta5W0OzsGDjflvVox-ZrPt5vRzXQyWay75wA
 id: paragraph.content_cards.default
 targetEntityType: paragraph
 bundle: content_cards
 mode: default
 content:
   field_content_cards_content:
     type: entity_reference_autocomplete
-    weight: 2
+    weight: 3
     region: content
     settings:
       match_operator: CONTAINS
       match_limit: 10
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  field_content_cards_desc:
+    type: text_textarea
+    weight: 1
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   field_content_cards_design:
     type: design_field_widget
-    weight: 1
+    weight: 2
     region: content
     settings: {  }
     third_party_settings: {  }

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

@@ -13,15 +13,15 @@ dependencies:
     - media_library
     - text
 _core:
-  default_config_hash: O4zMHxwRRHp-yrN0JH1svHXLCBbLGqZIF8WdjPfkhng
+  default_config_hash: 1tF0afbbZujeZfTAK0WE2kAsdLhOtyb7o4eHswFDOhs
 id: paragraph.liftup_with_image.default
 targetEntityType: paragraph
 bundle: liftup_with_image
 mode: default
 content:
   field_liftup_with_image_desc:
     type: text_textarea
-    weight: 3
+    weight: 2
     region: content
     settings:
       rows: 3
@@ -35,7 +35,7 @@ content:
     third_party_settings: {  }
   field_liftup_with_image_image:
     type: media_library_widget
-    weight: 2
+    weight: 3
     region: content
     settings:
       media_types: {  }

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

@@ -3,29 +3,39 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.paragraph.list_of_links.field_list_of_links_description
     - field.field.paragraph.list_of_links.field_list_of_links_design
     - field.field.paragraph.list_of_links.field_list_of_links_links
     - field.field.paragraph.list_of_links.field_list_of_links_title
     - paragraphs.paragraphs_type.list_of_links
   module:
     - hdbt_admin_tools
     - paragraphs
+    - text
 _core:
-  default_config_hash: SfY58zV6xN8OS738jhdT3WullLFwQRzTRPiQ0k7CZ1w
+  default_config_hash: CBb3pM84N6OGiFtNuC69ATBamK9oynwPZ0Zegf0LQCY
 id: paragraph.list_of_links.default
 targetEntityType: paragraph
 bundle: list_of_links
 mode: default
 content:
+  field_list_of_links_description:
+    type: text_textarea
+    weight: 1
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   field_list_of_links_design:
     type: design_field_widget
-    weight: 1
+    weight: 2
     region: content
     settings: {  }
     third_party_settings: {  }
   field_list_of_links_links:
     type: paragraphs
-    weight: 2
+    weight: 3
     region: content
     settings:
       title: Paragraph

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

@@ -4,25 +4,20 @@ status: true
 dependencies:
   config:
     - field.field.paragraph.contact_card.field_contact_description
-    - field.field.paragraph.contact_card.field_contact_image
     - field.field.paragraph.contact_card.field_contact_image_photographer
     - field.field.paragraph.contact_card.field_contact_image_reference
     - field.field.paragraph.contact_card.field_contact_name
-    - field.field.paragraph.contact_card.field_contact_social_media
     - field.field.paragraph.contact_card.field_contact_social_media_link
     - field.field.paragraph.contact_card.field_contact_title
     - field.field.paragraph.contact_card.field_email
     - field.field.paragraph.contact_card.field_phone_number
     - paragraphs.paragraphs_type.contact_card
-    - responsive_image.styles.square_thumbnail
   module:
-    - entity_reference_revisions
     - helfi_paragraphs_contact_card_listing
     - helfi_platform_config
-    - responsive_image
     - telephone
 _core:
-  default_config_hash: o3L_0VvwTNVLSBxb2Oqb8lmF6DAt6aBFZsubJMhB4Ro
+  default_config_hash: E9sy64OKJYCgwfUcTZp3_cLVjCJwJHAbHLBwr0zLTfQ
 id: paragraph.contact_card.default
 targetEntityType: paragraph
 bundle: contact_card
@@ -35,17 +30,6 @@ content:
     third_party_settings: {  }
     weight: 5
     region: content
-  field_contact_image:
-    type: responsive_image
-    label: hidden
-    settings:
-      responsive_image_style: square_thumbnail
-      image_link: ''
-      image_loading:
-        attribute: eager
-    third_party_settings: {  }
-    weight: 0
-    region: content
   field_contact_image_photographer:
     type: string
     label: hidden
@@ -71,15 +55,6 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
-  field_contact_social_media:
-    type: entity_reference_revisions_entity_view
-    label: hidden
-    settings:
-      view_mode: default
-      link: ''
-    third_party_settings: {  }
-    weight: 6
-    region: content
   field_contact_social_media_link:
     type: helfi_social_media_link
     label: hidden

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

@@ -4,13 +4,15 @@ status: true
 dependencies:
   config:
     - field.field.paragraph.content_cards.field_content_cards_content
+    - field.field.paragraph.content_cards.field_content_cards_desc
     - field.field.paragraph.content_cards.field_content_cards_design
     - field.field.paragraph.content_cards.field_content_cards_title
     - paragraphs.paragraphs_type.content_cards
   module:
     - options
+    - text
 _core:
-  default_config_hash: 3E6GOLjuMBSKLDtDYhIL4jlKnyfb9Y9XOJ6uHXAm9To
+  default_config_hash: '-hCnLZi0UC79-gcOup78czEbQ5EOlETKJjM8AM8V-jA'
 id: paragraph.content_cards.default
 targetEntityType: paragraph
 bundle: content_cards
@@ -25,6 +27,13 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
+  field_content_cards_desc:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
   field_content_cards_design:
     type: list_key
     label: inline

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

@@ -3,20 +3,29 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.paragraph.list_of_links.field_list_of_links_description
     - field.field.paragraph.list_of_links.field_list_of_links_design
     - field.field.paragraph.list_of_links.field_list_of_links_links
     - field.field.paragraph.list_of_links.field_list_of_links_title
     - paragraphs.paragraphs_type.list_of_links
   module:
     - entity_reference_revisions
     - options
+    - text
 _core:
-  default_config_hash: egzbaArGb-ZhmEcHga76M2daEqnPBaPHblxzH4Dxt8I
+  default_config_hash: PCFUdKbth0oZBX7sw5mAMGWUKbDSYpCrkPAWllyzzfw
 id: paragraph.list_of_links.default
 targetEntityType: paragraph
 bundle: list_of_links
 mode: default
 content:
+  field_list_of_links_description:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
   field_list_of_links_design:
     type: list_key
     label: inline