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

Dev to main
City-of-Helsinki · Dec 4, 2024 · 14c1aed · 14c1aed
2 parents 7854213 + 24ee80f
commit 14c1aed
Show file tree

Hide file tree

Showing 66 changed files with 693 additions and 722 deletions.
diff --git a/.env b/.env
@@ -7,7 +7,7 @@ COMPOSE_PROJECT_NAME=helfi-kymp
 PROJECT_NAME=liikenne
 
 # Default Docker compose profiles
-COMPOSE_PROFILES=search,queue
+COMPOSE_PROFILES=search
 
 # OpenShift project name
 OC_PROJECT_NAME=hki-kanslia-liikenne-test

diff --git a/.platform/schema b/.platform/schema
@@ -1 +1 @@
-10
+12
diff --git a/compose.yaml b/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:

diff --git a/composer.json b/composer.json
@@ -27,6 +27,7 @@
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+        "dg/bypass-finals": "^1.5",
         "drupal/coder": "^8.3",
         "drupal/core-dev": "^10.1",
         "jangregor/phpstan-prophecy": "^1.0",
@@ -116,7 +117,7 @@
             "@lint-php",
             "@test-php"
         ],
-        "test-php": "vendor/bin/phpunit -c phpunit.xml.dist",
+        "test-php": "vendor/bin/phpunit -c $PWD/phpunit.xml.dist",
         "lint-php": "vendor/bin/phpcs --standard=Drupal",
         "copy-commit-message-script": "make copy-commit-message-script",
         "post-install-cmd": [

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/block.block.eucookiecomplianceblock.yml b/conf/cmi/block.block.eucookiecomplianceblock.yml
diff --git a/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml b/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml
diff --git a/...i/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml b/...i/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
@@ -50,6 +50,7 @@ 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
@@ -58,7 +59,6 @@ settings:
       unit_search: unit_search
       service_list: service_list
       unit_contact_card: unit_contact_card
-      image_gallery: image_gallery
     negate: 0
     target_bundles_drag_drop:
       accordion:

diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/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

diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -42,13 +42,13 @@ module:
   gin_toolbar: 0
   hal: 0
   hdbt_admin_tools: 0
+  hdbt_cookie_banner: 0
   health_check: 0
   helfi_api_base: 0
   helfi_azure_fs: 0
   helfi_base_content: 0
   helfi_ckeditor: 0
   helfi_etusivu_entities: 0
-  helfi_eu_cookie_compliance: 0
   helfi_image_styles: 0
   helfi_kymp_content: 0
   helfi_kymp_migrations: 0
@@ -180,7 +180,6 @@ module:
   paragraphs: 11
   publication_date: 99
   minimal: 1000
-  eu_cookie_compliance: 1001
 theme:
   claro: 0
   stable9: 0

diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml
diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml
diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml
diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml