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

Dev to main

.env

@@ -15,7 +15,7 @@ OC_PROJECT_NAME=hki-kasko-kasvatus-koulutus-test
 STAGE_FILE_PROXY_ORIGIN=https://stplattaprod.blob.core.windows.net
 STAGE_FILE_PROXY_ORIGIN_DIR=kasvatuskoulutus76e5cprod
 
-COMPOSE_PROFILES=search,queue
+COMPOSE_PROFILES=search
 
 # Docker image
 DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.3

.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

@@ -31,6 +31,7 @@
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+        "dg/bypass-finals": "^1.5",
         "drupal/coder": "^8.3",
         "drupal/core-dev": "^10",
         "jangregor/phpstan-prophecy": "^1.0",

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

@@ -46,6 +46,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
@@ -54,7 +55,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:

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.tpr_unit.tpr_unit.default.yml

@@ -133,6 +133,16 @@ content:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
+  field_categories:
+    type: readonly_field_widget
+    weight: 39
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   field_content:
     type: paragraphs
     weight: 31
@@ -152,6 +162,16 @@ content:
         collapse_edit_all: collapse_edit_all
         duplicate: duplicate
     third_party_settings: {  }
+  field_hs_front_page:
+    type: entity_reference_autocomplete
+    weight: 31
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   field_lower_content:
     type: paragraphs
     weight: 33
@@ -179,6 +199,16 @@ content:
       sidebar: false
       use_details: true
     third_party_settings: {  }
+  field_ontologyword_details:
+    type: readonly_field_widget
+    weight: 40
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   field_phone_label:
     type: string_textfield
     weight: 11
@@ -194,6 +224,16 @@ content:
     settings:
       display_label: true
     third_party_settings: {  }
+  field_study_field:
+    type: select2_entity_reference
+    weight: 31
+    region: content
+    settings:
+      width: 100%
+      autocomplete: false
+      match_operator: CONTAINS
+      match_limit: 10
+    third_party_settings: {  }
   field_unit_type:
     type: entity_reference_autocomplete
     weight: 34
@@ -204,6 +244,13 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  hide_description:
+    type: boolean_checkbox
+    weight: 18
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   hide_sidebar_navigation:
     type: boolean_checkbox
     weight: 35
@@ -391,6 +438,16 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
+  subgroup:
+    type: readonly_field_widget
+    weight: 40
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   toc_enabled:
     type: boolean_checkbox
     weight: 3
@@ -439,63 +496,6 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
-  field_categories:
-    type: readonly_field_widget
-    weight: 39
-    region: content
-    settings:
-      label: above
-      formatter_type: null
-      formatter_settings: {  }
-      show_description: false
-    third_party_settings: {  }
-  field_hs_front_page:
-    type: entity_reference_autocomplete
-    weight: 31
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_ontologyword_details:
-    type: readonly_field_widget
-    weight: 40
-    region: content
-    settings:
-      label: above
-      formatter_type: null
-      formatter_settings: {  }
-      show_description: false
-    third_party_settings: {  }
-  field_study_field:
-    type: select2_entity_reference
-    weight: 31
-    region: content
-    settings:
-      width: 100%
-      autocomplete: false
-      match_operator: CONTAINS
-      match_limit: 10
-    third_party_settings: {  }
-  hide_description:
-    type: boolean_checkbox
-    weight: 18
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  subgroup:
-    type: readonly_field_widget
-    weight: 40
-    region: content
-    settings:
-      label: above
-      formatter_type: null
-      formatter_settings: {  }
-      show_description: false
-    third_party_settings: {  }
 hidden:
   created: true
   field_districts: true

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml

@@ -143,6 +143,13 @@ content:
     third_party_settings: {  }
     weight: 17
     region: content
+  field_ontologyword_details:
+    type: tpr_ontologyword_details_formatter
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 28
+    region: content
   field_phone_label:
     type: string
     label: hidden
@@ -280,6 +287,13 @@ content:
     third_party_settings: {  }
     weight: 16
     region: content
+  subgroup:
+    type: tpr_connection
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 32
+    region: content
   toc_enabled:
     type: boolean
     label: hidden
@@ -316,20 +330,6 @@ content:
     third_party_settings: {  }
     weight: 12
     region: content
-  field_ontologyword_details:
-    type: tpr_ontologyword_details_formatter
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 28
-    region: content
-  subgroup:
-    type: tpr_connection
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 32
-    region: content
 hidden:
   created: true
   field_categories: true

conf/cmi/core.extension.yml

@@ -44,6 +44,7 @@ module:
   group: 0
   group_content_menu: 0
   hdbt_admin_tools: 0
+  hdbt_cookie_banner: 0
   health_check: 0
   helfi_address_search: 0
   helfi_api_base: 0
@@ -52,7 +53,6 @@ module:
   helfi_calculator: 0
   helfi_ckeditor: 0
   helfi_etusivu_entities: 0
-  helfi_eu_cookie_compliance: 0
   helfi_group: 0
   helfi_image_styles: 0
   helfi_kasko_config: 0
@@ -185,7 +185,6 @@ module:
   paragraphs: 11
   publication_date: 99
   minimal: 1000
-  eu_cookie_compliance: 1001
 theme:
   stable9: 0
   claro: 0