UHF-10719

conf/cmi/search_api.index.schools.yml

@@ -2,9 +2,14 @@ uuid: 66be132d-2184-4b74-8f13-a79d758b964f
 langcode: en
 status: true
 dependencies:
+  config:
+    - field.storage.tpr_unit.field_ontologyword_details
+    - search_api.server.elastic_kasko
   module:
     - helfi_tpr
+    - search_api
     - helfi_kasko_content
+    - helfi_react_search
   enforced:
     config:
       - field.storage.tpr_unit.field_ontologyword_details
@@ -32,7 +37,7 @@ field_settings:
   coordinates:
     label: Coordinates
     property_path: coordinates
-    type: object
+    type: location
   id:
     label: ID
     datasource_id: 'entity:tpr_unit'

conf/cmi/search_api.server.elastic_kasko.yml

@@ -9,6 +9,11 @@ name: 'Elastic kasko'
 description: ''
 backend: elasticsearch
 backend_config:
-  cluster_settings:
-    cluster: kasko
-  fuzziness: auto
+  connector: standard
+  connector_config:
+    url: 'http://elastic:9200'
+    enable_debug_logging: false
+  advanced:
+    prefix: ''
+    suffix: ''
+    fuzziness: auto

public/modules/custom/helfi_kasko_content/src/EventSubscriber/KaskoElasticIndexSubscriber.php

@@ -5,7 +5,7 @@
 namespace Drupal\helfi_kasko_content\EventSubscriber;
 
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\elasticsearch_connector\Event\BuildIndexParamsEvent;
+use Drupal\elasticsearch_connector\Event\IndexParamsEvent;
 use Drupal\helfi_kasko_content\SchoolUtility;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -20,31 +20,32 @@
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
    *   The entity type manager.
    */
-  public function __construct(private readonly EntityTypeManagerInterface $entityTypeManager) {
+  public function __construct(
+    private readonly EntityTypeManagerInterface $entityTypeManager,
+  ) {
   }
 
   /**
    * {@inheritdoc}
    */
   public static function getSubscribedEvents(): array {
     return [
-      BuildIndexParamsEvent::BUILD_PARAMS => 'modifyOntologywordDetailsFields',
+      IndexParamsEvent::class => 'modifyOntologywordDetailsFields',
     ];
   }
 
   /**
    * Index only current schoolyear Ontologyword ids and clarifications.
    *
-   * @param \Drupal\elasticsearch_connector\Event\BuildIndexParamsEvent $event
+   * @param \Drupal\elasticsearch_connector\Event\IndexParamsEvent $event
    *   Event emitted by elasticsearch_connector.
    */
-  public function modifyOntologywordDetailsFields(BuildIndexParamsEvent $event): void {
+  public function modifyOntologywordDetailsFields(IndexParamsEvent $event): void {
     if ($event->getIndexName() !== 'schools') {
       return;
     }
 
-    /** @var array $params */
-    $params = $event->getElasticIndexParams();
+    $params = $event->getParams();
     $schoolYear = SchoolUtility::getCurrentComprehensiveSchoolYear();
 
     foreach ($params['body'] as $key => $body) {
@@ -53,9 +54,14 @@
 
       if (isset($body['ontologyword_details_clarifications'])) {
         foreach ($body['ontologyword_details_clarifications'] as $ontologywordDetailId) {
+          [$language] = $body['search_api_language'];
+
           /** @var \Drupal\helfi_tpr\Entity\OntologyWordDetails $ontologywordDetail */
-          $ontologywordDetail = $this->entityTypeManager->getStorage('tpr_ontology_word_details')->load($ontologywordDetailId);
-          $ontologywordDetail = $ontologywordDetail->hasTranslation($body['_language']) ? $ontologywordDetail->getTranslation($body['_language']) : $ontologywordDetail;
+          $ontologywordDetail = $this->entityTypeManager
+            ->getStorage('tpr_ontology_word_details')
+            ->load($ontologywordDetailId);
+
+          $ontologywordDetail = $ontologywordDetail->hasTranslation($language) ? $ontologywordDetail->getTranslation($language) : $ontologywordDetail;
           $ontologywordId = $ontologywordDetail->get('ontologyword_id')->getString();
           $detailItems = $ontologywordDetail->get('detail_items');
 
@@ -80,7 +86,7 @@
       }
     }
 
-    $event->setElasticIndexParams($params);
+    $event->setParams($params);
   }
 
 }

public/sites/default/all.settings.php

@@ -11,13 +11,12 @@
 
 // Elasticsearch settings.
 if (getenv('ELASTICSEARCH_URL')) {
-  $config['elasticsearch_connector.cluster.kasko']['url'] = getenv('ELASTICSEARCH_URL');
+  $config['search_api.server.elastic_kasko']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');
 
   if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) {
-    $config['elasticsearch_connector.cluster.kasko']['options']['use_authentication'] = '1';
-    $config['elasticsearch_connector.cluster.kasko']['options']['authentication_type'] = 'Basic';
-    $config['elasticsearch_connector.cluster.kasko']['options']['username'] = getenv('ELASTIC_USER');
-    $config['elasticsearch_connector.cluster.kasko']['options']['password'] = getenv('ELASTIC_PASSWORD');
+    $config['search_api.server.elastic_kasko']['backend_config']['connector'] = 'basicauth';
+    $config['search_api.server.elastic_kasko']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
+    $config['search_api.server.elastic_kasko']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
   }
 }