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

Dev to main

.platform/schema

@@ -1 +1 @@
-10
+12

compose.yaml

@@ -151,13 +151,12 @@ services:
       - search
   artemis:
     container_name: "${COMPOSE_PROJECT_NAME}-artemis"
-    image: quay.io/artemiscloud/activemq-artemis-broker
-    environment:
-      AMQ_EXTRA_ARGS: "--user admin --password admin"
+    image: apache/activemq-artemis
     depends_on:
       - app
     networks:
       - internal
+      - stonehenge-network
     profiles:
       - queue
   chromium:

composer.json

@@ -38,6 +38,7 @@
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+        "dg/bypass-finals": "^1.5",
         "dmore/chrome-mink-driver": "^2.8",
         "drupal/coder": "^8.3",
         "drupal/core-dev": "^10.0",

conf/cmi/block.block.hdbt_subtheme_helsinkinearyouheroblock.yml

@@ -0,0 +1,25 @@
+uuid: 04dcf865-ab62-4795-a169-ce57d1da73d7
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_etusivu
+    - system
+  theme:
+    - hdbt_subtheme
+id: hdbt_subtheme_helsinkinearyouheroblock
+theme: hdbt_subtheme
+region: before_content
+weight: 0
+provider: null
+plugin: helsinki_near_you_hero_block
+settings:
+  id: helsinki_near_you_hero_block
+  label: 'Helsinki near you hero block'
+  label_display: '0'
+  provider: helfi_etusivu
+visibility:
+  request_path:
+    id: request_path
+    negate: false
+    pages: "/helsinki-near-you\r\n/helsinki-lahellasi\r\n/helsingfors-nara-dig"

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

@@ -43,12 +43,12 @@ settings:
       contact_card_listing: contact_card_listing
       content_cards: content_cards
       image: image
+      image_gallery: image_gallery
       liftup_with_image: liftup_with_image
       list_of_links: list_of_links
       map: map
       sidebar_text: sidebar_text
       text: text
-      image_gallery: image_gallery
     negate: 0
     target_bundles_drag_drop:
       accordion:

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:
@@ -95,11 +95,11 @@ third_party_settings:
       children:
         - in_recommendations
         - show_annif_block
-        - annif_keywords
+        - annif_suggested_topics
       label: 'Automatically recommended content'
       region: content
       parent_name: ''
-      weight: 25
+      weight: 28
       format_type: fieldset
       format_settings:
         classes: ''
@@ -114,20 +114,6 @@ targetEntityType: node
 bundle: news_item
 mode: default
 content:
-  annif_keywords:
-    type: readonly_field_widget
-    weight: 2
-    region: content
-    settings:
-      label: above
-      formatter_type: entity_reference_label
-      formatter_settings:
-        entity_reference_entity_view:
-          view_mode: default
-        entity_reference_label:
-          link: false
-      show_description: false
-    third_party_settings: {  }
   annif_suggested_topics:
     type: suggested_topics_reference
     weight: 26
@@ -184,7 +170,7 @@ content:
     third_party_settings: {  }
   field_news_groups:
     type: select2_entity_reference
-    weight: 26
+    weight: 25
     region: content
     settings:
       width: 100%
@@ -212,7 +198,7 @@ content:
     third_party_settings: {  }
   field_news_item_tags:
     type: select2_entity_reference
-    weight: 19
+    weight: 26
     region: content
     settings:
       width: 100%

conf/cmi/core.extension.yml

@@ -43,6 +43,7 @@ module:
   gin_toolbar: 0
   hal: 0
   hdbt_admin_tools: 0
+  hdbt_cookie_banner: 0
   health_check: 0
   helfi_alt_lang_fallback: 0
   helfi_annif: 0
@@ -53,7 +54,6 @@ module:
   helfi_etusivu: 0
   helfi_etusivu_config: 0
   helfi_etusivu_entities: 0
-  helfi_eu_cookie_compliance: 0
   helfi_global_navigation: 0
   helfi_image_styles: 0
   helfi_media: 0
@@ -190,7 +190,6 @@ module:
   paragraphs: 11
   publication_date: 99
   minimal: 1000
-  eu_cookie_compliance: 1001
 theme:
   claro: 0
   stable9: 0