Revert "UHF-10643"

This reverts commit d4bb7dd.

Accidental commit to dev branch.

public/modules/custom/helfi_annif/helfi_annif.install

@@ -7,9 +7,6 @@
 
 declare(strict_types=1);
 
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-
 /**
  * Create entity definitions for annif-fields.
  */
@@ -99,29 +96,3 @@ function helfi_annif_update_9003(): void {
 
   // @todo remove obsolete field annif_keywords in a future update hook.
 }
-
-/**
- * Updates entity fields for suggested_topics.
- */
-function helfi_annif_update_9004(): void {
-  $fields['parent_id'] = BaseFieldDefinition::create('string')
-    ->setLabel(t('Parent ID'))
-    ->setDescription(t('The ID of the parent entity of which this entity is referenced.'))
-    ->setSetting('is_ascii', TRUE);
-
-  $fields['parent_type'] = BaseFieldDefinition::create('string')
-    ->setLabel(t('Parent type'))
-    ->setDescription(t('The entity parent type to which this entity is referenced.'))
-    ->setSetting('is_ascii', TRUE)
-    ->setSetting('max_length', EntityTypeInterface::ID_MAX_LENGTH);
-
-  $fields['parent_instance'] = BaseFieldDefinition::create('string')
-    ->setLabel(t('Parent instance'))
-    ->setDescription(t('The name of the instance where this entity is located at.'))
-    ->setSetting('is_ascii', TRUE);
-
-  foreach ($fields as $name => $field) {
-    \Drupal::entityDefinitionUpdateManager()
-      ->installFieldStorageDefinition($name, 'suggested_topics', 'helfi_annif', $field);
-  }
-}

public/modules/custom/helfi_annif/helfi_annif.services.yml

@@ -22,5 +22,3 @@ services:
   Drupal\helfi_annif\TextConverter\RenderTextConverter:
     tags:
       - { name: helfi_annif.text_converter, priority: -1 }
-
-  Drupal\helfi_annif\EventSubscriber\SearchApiSubscriber: ~

public/modules/custom/helfi_annif/src/Entity/SuggestedTopics.php

@@ -67,22 +67,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type): a
       ])
       ->setDisplayConfigurable('view', TRUE);
 
-    $fields['parent_id'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Parent ID'))
-      ->setDescription(t('The ID of the parent entity of which this entity is referenced.'))
-      ->setSetting('is_ascii', TRUE);
-
-    $fields['parent_type'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Parent type'))
-      ->setDescription(t('The entity parent type to which this entity is referenced.'))
-      ->setSetting('is_ascii', TRUE)
-      ->setSetting('max_length', EntityTypeInterface::ID_MAX_LENGTH);
-
-    $fields['parent_instance'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Parent instance'))
-      ->setDescription(t('The name of the instance where this entity is located at.'))
-      ->setSetting('is_ascii', TRUE);
-
     return $fields;
   }
 

public/modules/custom/helfi_annif/src/Plugin/Field/FieldType/ScoredEntityReferenceItem.php

@@ -15,8 +15,6 @@
 /**
  * Defines the 'scored_entity_reference' field type.
  *
- * @property mixed $score Item score.
- *
  * @see \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem
  * @see \Drupal\Core\Field\Plugin\Field\FieldType\FloatItem
  */

public/modules/custom/helfi_annif/src/Plugin/Field/FieldType/SuggestedTopicsReferenceItem.php

@@ -58,14 +58,12 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state):
   /**
    * {@inheritdoc}
    */
-  public function postSave($update): bool {
-    /** @var \Drupal\helfi_annif\Entity\SuggestedTopics $entity */
-    $parent = $this->getEntity();
-    $this->entity
-      ->set('parent_id', $parent->id())
-      ->save();
+  public function preSave() {
+    if ($this->hasNewEntity()) {
+      $this->entity->save();
+    }
 
-    return FALSE;
+    parent::preSave();
   }
 
   /**

public/modules/custom/helfi_annif/src/Plugin/Field/FieldWidget/SuggestedTopicsReferenceWidget.php

@@ -11,8 +11,6 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\helfi_annif\Entity\SuggestedTopics;
-use Drupal\helfi_api_base\Environment\EnvironmentResolverInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Defines the 'suggested_topics_reference' field widget.
@@ -30,20 +28,6 @@
 )]
 final class SuggestedTopicsReferenceWidget extends WidgetBase {
 
-  /**
-   * The environment resolver.
-   */
-  private EnvironmentResolverInterface $environmentResolver;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    $instance = new self($plugin_id, $plugin_definition, $configuration['field_definition'], $configuration['settings'], $configuration['third_party_settings']);
-    $instance->environmentResolver = $container->get(EnvironmentResolverInterface::class);
-    return $instance;
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -52,18 +36,8 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
 
     $hasTargetEntity = !empty($items[$delta]->target_id) && $items[$delta]->entity;
 
-    $project = NULL;
-    try {
-      $project = $this->environmentResolver->getActiveProject()->getName();
-    }
-    catch (\Exception) {
-    }
-
     /** @var \Drupal\helfi_annif\Entity\SuggestedTopics $entity */
-    $entity = $hasTargetEntity ? $items[$delta]->entity : SuggestedTopics::create([
-      'parent_type' => $items->getEntity()->getEntityTypeId(),
-      'parent_instance' => $project,
-    ]);
+    $entity = $hasTargetEntity ? $items[$delta]->entity : SuggestedTopics::create([]);
 
     $element['entity'] = [
       '#type' => 'value',