Fixing entity field derivers. (#392)

Author: fubhy

modules/graphql_content/src/Plugin/Deriver/DisplayedFieldDeriver.php

@@ -8,6 +8,7 @@
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
 use Drupal\graphql\Utility\StringHelper;
 use Drupal\graphql_content\ContentEntitySchemaConfig;
@@ -62,6 +63,8 @@ class DisplayedFieldDeriver extends DeriverBase implements ContainerDeriverInter
    *   Bundle info provider.
    * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entityFieldManager
    *   Entity field manager instance.
+   * @param \Drupal\graphql_content\ContentEntitySchemaConfig $schemaConfig
+   *   The schema config service.
    */
   public function __construct(
     EntityTypeManagerInterface $entityTypeManager,
@@ -125,25 +128,31 @@ public function getDerivativeDefinitions($basePluginDefinition) {
         continue;
       }
 
-      $storages = $this->entityFieldManager->getFieldStorageDefinitions($typeId);
-
+      $storageDefinitions = $this->entityFieldManager->getFieldStorageDefinitions($typeId);
       foreach (array_keys($bundles[$typeId]) as $bundle) {
         if ($viewMode = $this->schemaConfig->getExposedViewMode($typeId, $bundle)) {
           if ($display = $this->getDisplay($typeId, $bundle, $viewMode)) {
             foreach ($display->getComponents() as $field => $component) {
-              if (isset($component['type']) && $component['type'] == 'graphql_raw_value') {
+              if (isset($component['type']) && $component['type'] === 'graphql_raw_value') {
                 // Raw values formatter is obsolete.
                 continue;
               }
 
+              $storageDefinition = isset($storageDefinitions[$field]) ? $storageDefinitions[$field] : NULL;
+              if (isset($storageDefinition) && $storageDefinition instanceof BaseFieldDefinition) {
+                // Skip base fields. We generate them globally across all
+                // bundles.
+                continue;
+              }
+
               $this->derivatives[$typeId . '-' . $bundle . '-' . $field] = [
                 'name' => StringHelper::propCase($field),
                 'types' => [StringHelper::camelCase([$typeId, $bundle])],
                 'entity_type' => $typeId,
                 'bundle' => $bundle,
                 'field' => $field,
-                'virtual' => !array_key_exists($field, $storages),
-                'multi' => array_key_exists($field, $storages) ? $storages[$field]->getCardinality() != 1 : FALSE,
+                'virtual' => !isset($storageDefinition),
+                'multi' => isset($storageDefinition) ? $storageDefinition->getCardinality() != 1 : FALSE,
                 'cache_tags' => $display->getCacheTags(),
                 'cache_contexts' => $display->getCacheContexts(),
                 'cache_max_age' => $display->getCacheMaxAge(),

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

@@ -26,7 +26,7 @@ protected function getDerivativesFromPropertyDefinitions($entityTypeId, FieldSto
     $fieldName = $definition->getName();
 
     $derivative = [
-      'types' => [StringHelper::camelCase([$entityTypeId])],
+      'types' => isset($bundleId) ? [StringHelper::camelCase([$entityTypeId, $bundleId])] : [StringHelper::camelCase([$entityTypeId])],
       'name' => EntityField::getId($fieldName),
       'multi' => $definition->isMultiple(),
       'field' => $fieldName,
@@ -46,8 +46,7 @@ protected function getDerivativesFromPropertyDefinitions($entityTypeId, FieldSto
       $derivative['type'] = EntityFieldType::getId($entityTypeId, $fieldName);
     }
 
-    $key = is_null($bundleId) ? "$entityTypeId-$fieldName" : "$entityTypeId-$bundleId-$fieldName";
-
+    $key = !isset($bundleId) ? "$entityTypeId-$fieldName" : "$entityTypeId-$bundleId-$fieldName";
     $this->derivatives[$key] = $derivative + $basePluginDefinition;
   }
 }

modules/graphql_core/src/Plugin/GraphQL/Fields/Entity/EntityField.php

@@ -23,7 +23,7 @@
 class EntityField extends EntityFieldBase {
 
   /**
-   * Returns a string if for the plugin.
+   * Returns a string id for the plugin.
    *
    * @param string $fieldName
    *   Field id.