Dev to main

compose.yaml

@@ -161,16 +161,6 @@ services:
       - "traefik.port=9200"
     profiles:
       - search
-  artemis:
-    container_name: "${COMPOSE_PROJECT_NAME}-artemis"
-    image: apache/activemq-artemis
-    depends_on:
-      - app
-    networks:
-      - internal
-      - stonehenge-network
-    profiles:
-      - queue
   chromium:
     image: selenium/standalone-chromium
     environment:

composer.json

@@ -11,8 +11,8 @@
         "cweagans/composer-patches": "^1.6.7",
         "drupal/better_exposed_filters": "^7.0",
         "drupal/flexible_permissions": "^2.0",
-        "drupal/group": "^2.0",
-        "drupal/group_content_menu": "^2.0",
+        "drupal/group": "^3.0",
+        "drupal/group_content_menu": "^3.0",
         "drupal/hdbt": "^6.0",
         "drupal/hdbt_admin": "^3.0",
         "drupal/helfi_azure_fs": "^2.0",
@@ -97,13 +97,7 @@
         },
         "patches": {
             "drupal/group": {
-                "Prevent null when loading group membership roles (https://www.drupal.org/i/3197610)": "./patches/group-3197610_prevent_null_on_group_getroles.patch",
-                "https://www.drupal.org/i/2815971": "./patches/2815971.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",
-                "Fix for group relation type entity type definitions not available first cache rebuild after site install": "./patches/group_relation_type_entity_type_definitions_during_cache_rebuild.patch"
-            },
-            "drupal/group_content_menu": {
-                "Fix for group_content_menu derivative definition load during first cache rebuild after site install": "./patches/group_content_menu_derivative_definition_load_during_cache_rebuild.patch"
+                "https://www.drupal.org/i/2815971": "./patches/2815971.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.hdbt_subtheme_crossinstitutionalstudiesheroblock.yml

@@ -0,0 +1,25 @@
+uuid: 9c9ab053-1faf-41ec-ac04-979dc404b783
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_kasko_content
+    - system
+  theme:
+    - hdbt_subtheme
+id: hdbt_subtheme_crossinstitutionalstudiesheroblock
+theme: hdbt_subtheme
+region: before_content
+weight: 0
+provider: null
+plugin: cross_institutional_studies_hero_block
+settings:
+  id: cross_institutional_studies_hero_block
+  label: 'Cross Institutional Studies Hero Block'
+  label_display: '0'
+  provider: helfi_kasko_content
+visibility:
+  request_path:
+    id: request_path
+    negate: false
+    pages: "/cross-institutional-studies-search\r\n/ristiinopiskeluhaku\r\n/korsstudiersök"

conf/cmi/block.block.helfirecommendationsblock.yml

@@ -5,13 +5,13 @@ dependencies:
   module:
     - helfi_recommendations
     - language
-    - node
+    - system
   theme:
     - hdbt_subtheme
 id: helfirecommendationsblock
 theme: hdbt_subtheme
 region: content
-weight: 1
+weight: 10
 provider: helfi_recommendations
 plugin: helfi_recommendations
 settings: