Fix language handling and add language switch links (#509)

Author: fubhy

modules/graphql_core/src/Plugin/GraphQL/Enums/Languages/LanguageId.php

@@ -70,5 +70,4 @@ public function buildValues(PluggableSchemaBuilderInterface $schemaBuilder) {
 
     return $values;
   }
-
 }

modules/graphql_core/src/Plugin/GraphQL/Fields/Breadcrumbs/Breadcrumbs.php

@@ -14,14 +14,12 @@
 /**
  * Retrieve the breadcrumbs.
  *
- * TODO: Move this to `InternalUrl` (breaking change).
- *
  * @GraphQLField(
  *   id = "breadcrumb",
  *   secure = true,
  *   name = "breadcrumb",
  *   type = "[Link]",
- *   parents = {"Url"},
+ *   parents = {"InternalUrl"},
  * )
  */
 class Breadcrumbs extends FieldPluginBase implements ContainerFactoryPluginInterface {

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

@@ -6,6 +6,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\TypedData\TranslatableInterface;
 use Drupal\graphql\Plugin\GraphQL\Fields\FieldPluginBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Youshido\GraphQL\Execution\ResolveInfo;
@@ -65,7 +66,7 @@ public function __construct(array $configuration, $pluginId, $pluginDefinition,
    * {@inheritdoc}
    */
   public function resolveValues($value, array $args, ResolveInfo $info) {
-    if ($value instanceof EntityInterface) {
+    if ($value instanceof EntityInterface && $value instanceof TranslatableInterface && $value->isTranslatable()) {
       yield $this->entityRepository->getTranslationFromContext($value, $args['language']);
     }
   }

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

@@ -2,8 +2,13 @@
 
 namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Entity;
 
+use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityRepositoryInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\TypedData\TranslatableInterface;
 use Drupal\graphql\Plugin\GraphQL\Fields\FieldPluginBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Youshido\GraphQL\Execution\ResolveInfo;
 
 /**
@@ -15,16 +20,58 @@
  *   parents = {"Entity"}
  * )
  */
-class EntityTranslations extends FieldPluginBase {
+class EntityTranslations extends FieldPluginBase implements ContainerFactoryPluginInterface {
+  use DependencySerializationTrait;
+
+  /**
+   * The entity repository service.
+   *
+   * @var \Drupal\Core\Entity\EntityRepositoryInterface
+   */
+  protected $entityRepository;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $pluginId, $pluginDefinition) {
+    return new static(
+      $configuration,
+      $pluginId,
+      $pluginDefinition,
+      $container->get('entity.repository')
+    );
+  }
+
+  /**
+   * EntityTranslations constructor.
+   *
+   * @param array $configuration
+   *   The plugin configuration array.
+   * @param string $pluginId
+   *   The plugin id.
+   * @param mixed $pluginDefinition
+   *   The plugin definition array.
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entityRepository
+   *   The entity repository service.
+   */
+  public function __construct(
+    array $configuration,
+    $pluginId,
+    $pluginDefinition,
+    EntityRepositoryInterface $entityRepository
+  ) {
+    parent::__construct($configuration, $pluginId, $pluginDefinition);
+    $this->entityRepository = $entityRepository;
+  }
 
   /**
    * {@inheritdoc}
    */
   public function resolveValues($value, array $args, ResolveInfo $info) {
-    if ($value instanceof ContentEntityInterface) {
+    if ($value instanceof ContentEntityInterface && $value instanceof TranslatableInterface && $value->isTranslatable()) {
       $languages = $value->getTranslationLanguages();
       foreach ($languages as $language) {
-        yield $value->getTranslation($language->getId());
+        yield $this->entityRepository->getTranslationFromContext($value, $language->getId());
       }
     }
   }

…n/GraphQL/Fields/Links/LinkAttribute.php …lds/Entity/Fields/Link/LinkAttribute.phpmodules/graphql_core/src/Plugin/GraphQL/Fields/Links/LinkAttribute.php renamed to modules/graphql_core/src/Plugin/GraphQL/Fields/Entity/Fields/Link/LinkAttribute.php modules/graphql_core/src/Plugin/GraphQL/Fields/Links/LinkAttribute.php renamed to modules/graphql_core/src/Plugin/GraphQL/Fields/Entity/Fields/Link/LinkAttribute.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Links;
+namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Entity\Fields\Link;
 
 use Drupal\Component\Utility\NestedArray;
 use Drupal\link\LinkItemInterface;

…/Plugin/GraphQL/Fields/Links/LinkUrl.php …QL/Fields/Entity/Fields/Link/LinkUrl.phpmodules/graphql_core/src/Plugin/GraphQL/Fields/Links/LinkUrl.php renamed to modules/graphql_core/src/Plugin/GraphQL/Fields/Entity/Fields/Link/LinkUrl.php modules/graphql_core/src/Plugin/GraphQL/Fields/Links/LinkUrl.php renamed to modules/graphql_core/src/Plugin/GraphQL/Fields/Entity/Fields/Link/LinkUrl.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Links;
+namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Entity\Fields\Link;
 
 use Drupal\graphql\Plugin\GraphQL\Fields\FieldPluginBase;
 use Drupal\link\LinkItemInterface;

modules/graphql_core/src/Plugin/GraphQL/Fields/EntityQuery/EntityQuery.php

@@ -101,7 +101,7 @@ public function resolveValues($value, array $args, ResolveInfo $info) {
    * Retrieve the target entity type of this plugin.
    *
    * @param mixed $value
-   *   The parent entity type.
+   *   The parent value.
    * @param array $args
    *   The field arguments array.
    * @param \Youshido\GraphQL\Execution\ResolveInfo $info
@@ -174,9 +174,33 @@ protected function getBaseQuery($value, array $args, ResolveInfo $info) {
     $query = $entityStorage->getQuery();
     $query->accessCheck(TRUE);
 
+    // The context object can e.g. transport the parent entity language.
+    $query->addMetaData('graphql_context', $this->getQueryContext($value, $args, $info));
+
     return $query;
   }
 
+  /**
+   * Retrieves an arbitrary value to write into the query metadata.
+   *
+   * @param mixed $value
+   *   The parent value.
+   * @param array $args
+   *   The field arguments array.
+   * @param \Youshido\GraphQL\Execution\ResolveInfo $info
+   *   The resolve info object.
+   *
+   * @return mixed
+   *   The query context.
+   */
+  protected function getQueryContext($value, array $args, ResolveInfo $info) {
+    // Forward the whole set of arguments by default.
+    return [
+      'parent' => $value,
+      'args' => $args,
+      'info' => $info,
+    ];
+  }
 
   /**
    * Apply the specified revision filtering mode to the query.

modules/graphql_core/src/Plugin/GraphQL/Fields/EntityQuery/EntityQueryEntities.php

@@ -3,9 +3,13 @@
 namespace Drupal\graphql_core\Plugin\GraphQL\Fields\EntityQuery;
 
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\Query\QueryInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\TypedData\TranslatableInterface;
 use Drupal\graphql\GraphQL\Buffers\EntityBuffer;
 use Drupal\graphql\GraphQL\Cache\CacheableValue;
 use Drupal\graphql\Plugin\GraphQL\Fields\FieldPluginBase;
@@ -20,7 +24,10 @@
  *   secure = true,
  *   name = "entities",
  *   type = "[Entity]",
- *   parents = {"EntityQueryResult"}
+ *   parents = {"EntityQueryResult"},
+ *   arguments = {
+ *     "language" = "LanguageId"
+ *   }
  * )
  */
 class EntityQueryEntities extends FieldPluginBase implements ContainerFactoryPluginInterface {
@@ -40,6 +47,13 @@ class EntityQueryEntities extends FieldPluginBase implements ContainerFactoryPlu
    */
   protected $entityTypeManager;
 
+  /**
+   * The entity repository service.
+   *
+   * @var \Drupal\Core\Entity\EntityRepositoryInterface
+   */
+  protected $entityRepository;
+
   /**
    * {@inheritdoc}
    */
@@ -49,6 +63,7 @@ public static function create(ContainerInterface $container, array $configuratio
       $pluginId,
       $pluginDefinition,
       $container->get('entity_type.manager'),
+      $container->get('entity.repository'),
       $container->get('graphql.buffer.entity')
     );
   }
@@ -64,6 +79,8 @@ public static function create(ContainerInterface $container, array $configuratio
    *   The plugin definition array.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
    *   The entity type manager service.
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entityRepository
+   *   The entity repository service.
    * @param \Drupal\graphql\GraphQL\Buffers\EntityBuffer $entityBuffer
    *   The entity buffer service.
    */
@@ -72,11 +89,13 @@ public function __construct(
     $pluginId,
     $pluginDefinition,
     EntityTypeManagerInterface $entityTypeManager,
+    EntityRepositoryInterface $entityRepository,
     EntityBuffer $entityBuffer
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
-    $this->entityBuffer = $entityBuffer;
     $this->entityTypeManager = $entityTypeManager;
+    $this->entityRepository = $entityRepository;
+    $this->entityBuffer = $entityBuffer;
   }
 
   /**
@@ -86,13 +105,14 @@ public function resolveValues($value, array $args, ResolveInfo $info) {
     if ($value instanceof QueryInterface) {
       $type = $value->getEntityTypeId();
       $result = $value->execute();
+      $context = $value->getMetaData('graphql_context');
 
       if ($value->hasTag('revisions')) {
-        return $this->resolveFromRevisionIds($type, array_keys($result));
+        return $this->resolveFromRevisionIds($type, array_keys($result), $context, $args, $info);
       }
 
       // If this is a revision query, the version ids are the array keys.
-      return $this->resolveFromEntityIds($type, array_values($result));
+      return $this->resolveFromEntityIds($type, array_values($result), $context, $args, $info);
     }
   }
 
@@ -103,14 +123,20 @@ public function resolveValues($value, array $args, ResolveInfo $info) {
    *   The entity type.
    * @param array $ids
    *   The entity ids to load.
+   * @param mixed $context
+   *   The query context.
+   * @param array $args
+   *   The field arguments array.
+   * @param \Youshido\GraphQL\Execution\ResolveInfo $info
+   *   The resolve info object.
    *
    * @return \Closure
    *   The deferred resolver.
    */
-  protected function resolveFromEntityIds($type, $ids) {
+  protected function resolveFromEntityIds($type, $ids, $context, array $args, ResolveInfo $info) {
     $resolve = $this->entityBuffer->add($type, $ids);
-    return function($value, array $args, ResolveInfo $info) use ($resolve) {
-      return $this->resolveEntities($resolve());
+    return function($value, array $args, ResolveInfo $info) use ($resolve, $context) {
+      return $this->resolveEntities($resolve(), $context, $args, $info);
     };
   }
 
@@ -121,33 +147,51 @@ protected function resolveFromEntityIds($type, $ids) {
    *   The entity type.
    * @param array $ids
    *   The entity revision ids to load.
+   * @param mixed $context
+   *   The query context.
+   * @param array $args
+   *   The field arguments array.
+   * @param \Youshido\GraphQL\Execution\ResolveInfo $info
+   *   The resolve info object.
    *
    * @return \Generator
    *   The resolved revisions.
    */
-  protected function resolveFromRevisionIds($type, $ids) {
+  protected function resolveFromRevisionIds($type, $ids, $context, array $args, ResolveInfo $info) {
     $storage = $this->entityTypeManager->getStorage($type);
     $entities = array_map(function ($id) use ($storage) {
       return $storage->loadRevision($id);
     }, $ids);
 
-    return $this->resolveEntities($entities);
+    return $this->resolveEntities($entities, $context, $args, $info);
   }
 
   /**
    * Resolves entity objects and checks view permissions.
    *
    * @param array $entities
    *   The entities to resolve.
+   * @param mixed $context
+   *   The query context.
+   * @param array $args
+   *   The field arguments array.
+   * @param \Youshido\GraphQL\Execution\ResolveInfo $info
+   *   The resolve info object.
    *
    * @return \Generator
    *   The resolved entities.
    */
-  protected function resolveEntities(array $entities) {
+  protected function resolveEntities(array $entities, $context, array $args, ResolveInfo $info) {
+    $language = $this->negotiateLanguage($context, $args, $info);
+
     /** @var \Drupal\Core\Entity\EntityInterface $entity */
     foreach ($entities as $entity) {
-      $access = $entity->access('view', NULL, TRUE);
+      // Translate the entity if it is translatable and a language was given.
+      if ($language && $entity instanceof TranslatableInterface && $entity->isTranslatable()) {
+        $entity = $this->entityRepository->getTranslationFromContext($entity, $language);
+      }
 
+      $access = $entity->access('view', NULL, TRUE);
       if ($access->isAllowed()) {
         yield $entity->addCacheableDependency($access);
       }
@@ -157,4 +201,29 @@ protected function resolveEntities(array $entities) {
     }
   }
 
+  /**
+   * Negotiate the language for the resolved entities.
+   *
+   * @param mixed $context
+   *   The query context.
+   * @param array $args
+   *   The field arguments array.
+   * @param \Youshido\GraphQL\Execution\ResolveInfo $info
+   *   The resolve info object.
+   *
+   * @return string|null
+   *   The negotiated language id.
+   */
+  protected function negotiateLanguage($context, $args, ResolveInfo $info) {
+    if (!empty($args['language'])) {
+      return $args['language'];
+    }
+
+    if (isset($context['parent']) && ($parent = $context['parent']) && $parent instanceof EntityInterface) {
+      return $parent->language()->getId();
+    }
+
+    return NULL;
+  }
+
 }

modules/graphql_core/src/Plugin/GraphQL/Fields/EntityReference/EntityReferenceReverse.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\graphql_core\Plugin\GraphQL\Fields\EntityReference;
 
-use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\graphql_core\Plugin\GraphQL\Fields\EntityQuery\EntityQuery;
 use Youshido\GraphQL\Execution\ResolveInfo;
 
@@ -36,7 +36,7 @@ class EntityReferenceReverse extends EntityQuery {
    * {@inheritdoc}
    */
   public function getBaseQuery($value, array $args, ResolveInfo $info) {
-    if ($value instanceof EntityInterface) {
+    if ($value instanceof ContentEntityInterface) {
       $query = parent::getBaseQuery($value, $args, $info);
 
       // Add the target field condition to the query.