drupal-graphql#1338: Fix error while trying to load an entity when th…

…ere is no translation for a given language
smavri-axess · Jun 6, 2024 · d7cc9ed · d7cc9ed
1 parent d9ad85d
commit d7cc9ed
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php
@@ -171,7 +171,7 @@ public function resolve($type, $id, ?string $language, ?array $bundles, ?bool $a
  }
 
  // Get the correct translation.
- if (isset($language) && $language !== $entity->language()->getId() && $entity instanceof TranslatableInterface) {
+ if (isset($language) && $language !== $entity->language()->getId() && $entity instanceof TranslatableInterface && $entity->hasTranslation($language)) {
  $entity = $entity->getTranslation($language);
  $entity->addCacheContexts(["static:language:{$language}"]);
  }

diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php
@@ -164,7 +164,7 @@ public function resolve($type, $uuid, ?string $language, ?array $bundles, ?bool
  }
 
  // Get the correct translation.
- if (isset($language) && $language != $entity->language()->getId() && $entity instanceof TranslatableInterface) {
+ if (isset($language) && $language != $entity->language()->getId() && $entity instanceof TranslatableInterface && $entity->hasTranslation($language)) {
  $entity = $entity->getTranslation($language);
  $entity->addCacheContexts(["static:language:{$language}"]);
  }

diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityTranslation.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityTranslation.php
@@ -103,7 +103,7 @@ public function __construct(array $configuration, $pluginId, $pluginDefinition,
  * @return \Drupal\Core\Entity\EntityInterface|null
  */
  public function resolve(EntityInterface $entity, $language, ?bool $access, ?AccountInterface $accessUser, ?string $accessOperation, FieldContext $context) {
- if ($entity instanceof TranslatableInterface && $entity->isTranslatable()) {
+ if ($entity instanceof TranslatableInterface && $entity->isTranslatable() && $entity->hasTranslation($language)) {
  $entity = $entity->getTranslation($language);
  $entity->addCacheContexts(["static:language:{$language}"]);
  // Check if the passed user (or current user if none is passed) has access

diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityTranslations.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityTranslations.php
@@ -107,6 +107,9 @@ public function resolve(EntityInterface $entity, ?bool $access, ?AccountInterfac
 
  return array_map(function (LanguageInterface $language) use ($entity, $access, $accessOperation, $accessUser, $context) {
  $langcode = $language->getId();
+ if (!$entity->hasTranslation($language)) {
+ return NULL;
+ }
  $entity = $entity->getTranslation($langcode);
  $entity->addCacheContexts(["static:language:{$langcode}"]);
  if ($access) {

diff --git a/src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php b/src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php
@@ -125,7 +125,7 @@ public function resolve($url, ?string $language, FieldContext $context): ?Deferr
  }
 
  // Get the correct translation.
- if (isset($language) && $language != $entity->language()->getId() && $entity instanceof TranslatableInterface) {
+ if (isset($language) && $language != $entity->language()->getId() && $entity instanceof TranslatableInterface && $entity->hasTranslation($language)) {
  $entity = $entity->getTranslation($language);
  $entity->addCacheContexts(["static:language:{$language}"]);
  }

diff --git a/src/Plugin/GraphQL/DataProducer/Taxonomy/TaxonomyLoadTree.php b/src/Plugin/GraphQL/DataProducer/Taxonomy/TaxonomyLoadTree.php
@@ -174,7 +174,7 @@ public function resolve(string $vid, int $parent, ?int $max_depth, ?string $lang
  foreach ($entities as $id => $entity) {
  $context->addCacheableDependency($entities[$id]);
 
- if (isset($language) && $language !== $entities[$id]->language()->getId() && $entities[$id] instanceof TranslatableInterface) {
+ if (isset($language) && $language !== $entities[$id]->language()->getId() && $entities[$id] instanceof TranslatableInterface && $entities[$id]->hasTranslation($language)) {
  $entities[$id] = $entities[$id]->getTranslation($language);
  $entities[$id]->addCacheContexts(["static:language:{$language}"]);
  }