Merge pull request #308 from epam/fix-quanthub-visualization-dataset-field

Support field_qh_visualization_dataset for backward compatibility

Author: drudoi

modules/quanthub_visualization/src/Plugin/Field/FieldFormatter/QuanthubVisualizationFormatter.php

@@ -35,8 +35,11 @@ public function viewElements(FieldItemListInterface $items, $langcode): array {
     $dafnaType = $entity->field_qh_visualization_type->value;
     $dataFilters = $entity->field_visualization_filters->value;
 
-    $referencedDataset = $entity
-      ->get('field_dataset')
+    // Support "field_qh_visualization_dataset" for backward compatibility.
+    $field = $entity->hasField('field_dataset')
+      ? $entity->get('field_dataset')
+      : $entity->get('field_qh_visualization_dataset');
+    $referencedDataset = $field
       ->first()
       ->get('entity')
       ->getTarget()

modules/quanthub_visualization/src/Service/PreviewHelper.php

@@ -30,7 +30,11 @@ public function __construct(protected EntityTypeManagerInterface $entityTypeMana
    */
   public function provideDrupalSettingsData(FormStateInterface $form_state) {
     $nodeStorage = $this->entityTypeManager->getStorage('node');
-    $datasetUrn = $nodeStorage->load($form_state->getValue('field_dataset')[0]['target_id'])->get('field_quanthub_urn')->getString();
+
+    // Support "field_qh_visualization_dataset" for backward compatibility.
+    $datasetField = $form_state->getValue('field_dataset')[0]['target_id']
+      ?? $form_state->getValue('field_media_qh_visualization')[0]['target_id'];
+    $datasetUrn = $nodeStorage->load($datasetField)->get('field_quanthub_urn')->getString();
 
     $filters = $form_state->getValue('field_qh_visualization_filters')[0]['value'];