Update configuration

Author: hel-platta-service

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.lock

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

conf/cmi/block.block.helfirecommendationsblock.yml

@@ -151,7 +151,6 @@ module:
   social_media: 0
   sophron: 0
   stage_file_proxy: 0
-  stomp: 0
   system: 0
   taxonomy: 0
   telephone: 0

conf/cmi/core.extension.yml

@@ -2,6 +2,7 @@ _core:
   default_config_hash: do7QLcSY6lDV82NBI3jy5FNsUwWFjjJzXmHPTGsSvIQ
 quality: 75
 binaries: imagemagick
+imagemagick_version: v7
 path_to_binaries: ''
 prepend: ''
 log_warnings: true

conf/cmi/imagemagick.settings.yml

@@ -21,14 +21,7 @@ display:
           exposed_sorts_label: 'Sortera efter'
           sort_asc_label: Stigande
           sort_desc_label: Fallande
-      arguments:
-        created_year_month:
-          title: '{{ arguments.created_year_month }}'
   block_1:
     display_title: Block
-    display_options:
-      arguments:
-        created_year_month:
-          title: '{{ arguments.created_year_month }}'
   page_1:
     display_title: Sida

conf/cmi/language/sv/views.view.archive.yml

@@ -6,8 +6,6 @@ display:
     display_options:
       title: Filer
       fields:
-        fid:
-          label: Fid
         filename:
           label: Namn
           separator: ', '
@@ -26,8 +24,6 @@ display:
           label: 'Datum för ändring'
         count:
           label: 'Används i'
-          alter:
-            path: 'admin/content/files/usage/{{ fid }}'
           format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
       pager:
         options:
@@ -76,7 +72,6 @@ display:
           label: 'Registrerar modul'
         count:
           label: 'Antal använd'
-          format_plural_string: !!binary MQNAY291bnQ=
       pager:
         options:
           tags:

conf/cmi/language/sv/views.view.files.yml

@@ -19,9 +19,6 @@ display:
           label: Roller
         created:
           label: 'Medlem i'
-          settings:
-            future_format: '@interval'
-            past_format: '@interval'
         access:
           label: 'Senast åtkomst'
           settings:

conf/cmi/language/sv/views.view.user_admin_people.yml

@@ -258,42 +258,6 @@ function drupal_get_env(string|array $variables) : mixed {
   $config['helfi_proxy.settings']['session_suffix'] = $session_suffix;
 }
 
-$amq_destination = drupal_get_env([
-  'PROJECT_NAME',
-]);
-$amq_brokers = getenv('AMQ_BROKERS');
-
-if ($amq_brokers && $amq_destination) {
-  $settings['stomp']['default'] = [
-    'clientId' => getenv('AMQ_CLIENT_ID') ?: 'client_ ' . $amq_destination,
-    'login' => getenv('AMQ_USER') ?: NULL,
-    'passcode' => getenv('AMQ_PASSWORD') ?: NULL,
-    'destination' => sprintf('/queue/%s', $amq_destination),
-    'brokers' => $amq_brokers,
-    'timeout' => ['read' => 12000],
-    'heartbeat' => [
-      'send' => 20000,
-      'receive' => 0,
-      'observers' => [
-        [
-          'class' => '\Stomp\Network\Observer\HeartbeatEmitter',
-        ],
-      ],
-    ],
-  ];
-
-  $queues = [
-    'helfi_navigation_menu_queue',
-    'helfi_api_base_revision',
-  ];
-  foreach ($queues as $queue) {
-    // $settings['queue_service_' . $queue] = 'queue.stomp.default';
-  }
-  // You must configure project specific queues manually in 'all.settings.php'
-  // file.
-  // @see https://github.com/City-of-Helsinki/drupal-helfi-platform/blob/main/documentation/queue.md
-}
-
 if (
   ($redis_host = getenv('REDIS_HOST')) &&
   file_exists('modules/contrib/redis/redis.services.yml') &&
@@ -401,6 +365,12 @@ function drupal_get_env(string|array $variables) : mixed {
   $config['helfi_search.settings']['openai_model'] = getenv('OPENAI_MODEL');
 }
 
+// Hakuvahti:
+if (getenv('HAKUVAHTI_URL')) {
+  $config['helfi_hakuvahti.settings']['base_url'] = getenv('HAKUVAHTI_URL');
+  $config['helfi_hakuvahti.settings']['api_key'] = getenv('HAKUVAHTI_API_KEY');
+}
+
 // E2E test users. We should never do this in production, so adding a failsafe
 // in case the environment variable would ever end up in production.
 if (getenv('APP_ENV') !== 'production' && $e2e_test_user = getenv('E2E_TEST_USER')) {