#389 Fix for interface regression introduced by base fields. (#390)

Author: blazeyo

modules/graphql_core/src/Plugin/Deriver/Fields/EntityFieldDeriverBase.php

@@ -139,4 +139,17 @@ public function getDerivativeDefinitions($basePluginDefinition) {
     return $this->derivatives;
   }
 
+  /**
+   * Tells if given field has just a single property.
+   *
+   * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $definition
+   *   Field definition.
+   *
+   * @return bool
+   */
+  protected function isSinglePropertyField(FieldStorageDefinitionInterface $definition) {
+    $properties = $definition->getPropertyDefinitions();
+    return count($properties) === 1;
+  }
+
 }

modules/graphql_core/src/Plugin/Deriver/Types/EntityFieldTypeDeriver.php

@@ -20,11 +20,14 @@ class EntityFieldTypeDeriver extends EntityFieldDeriverBase {
   protected function getBaseFieldDefinition($entityTypeId, BaseFieldDefinition $baseFieldDefinition, array $basePluginDefinition) {
     $fieldName = $baseFieldDefinition->getName();
 
+    if ($this->isSinglePropertyField($baseFieldDefinition)) {
+      return;
+    }
+
     $this->derivatives["$entityTypeId-$fieldName"] = [
       'name' => EntityFieldType::getId($entityTypeId, $fieldName),
       'entity_type' => $entityTypeId,
       'data_type' => "entity:$entityTypeId:$fieldName",
-      'interfaces' => [EntityType::getId($entityTypeId)],
     ] + $basePluginDefinition;
   }
 
@@ -34,11 +37,14 @@ protected function getBaseFieldDefinition($entityTypeId, BaseFieldDefinition $ba
   protected function getConfigFieldDefinition($entityTypeId, $bundleId, FieldStorageDefinitionInterface $storage, array $basePluginDefinition) {
     $fieldName = $storage->getName();
 
+    if ($this->isSinglePropertyField($storage)) {
+      return;
+    }
+
     $this->derivatives["$entityTypeId-$bundleId-$fieldName"] = [
       'name' => EntityFieldType::getId($entityTypeId, $fieldName),
       'entity_type' => $entityTypeId,
       'data_type' => "entity:$entityTypeId:$bundleId:$fieldName",
-      'interfaces' => [EntityBundle::getId($entityTypeId, $bundleId)],
       'bundle' => $bundleId,
     ] + $basePluginDefinition;
   }

modules/graphql_core/tests/src/Kernel/Entity/EntityFieldValueTest.php

@@ -3,7 +3,6 @@
 namespace Drupal\Tests\graphql_core\Kernel\Entity;
 
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Entity\Entity\EntityViewMode;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\file\Entity\File;