Fixing partial caching.

Author: fubhy

src/Plugin/GraphQL/DataProducer/DataProducerPluginCachingTrait.php

@@ -2,13 +2,23 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer;
 
+use Drupal\Core\Entity\EntityInterface;
+
 trait DataProducerPluginCachingTrait {
 
   /**
    * {@inheritdoc}
    */
   public function edgeCachePrefix() {
-    return hash('sha256', serialize($this->getContextValues()));
+    $contexts = array_map(function ($context) {
+      if ($context instanceof EntityInterface) {
+        return $context->uuid();
+      }
+
+      return $context;
+    }, $this->getContextValues());
+
+    return hash('sha256', serialize($contexts));
   }
 
   /**

src/Plugin/GraphQL/DataProducer/DataProducerProxy.php

@@ -240,17 +240,16 @@ protected function resolveCached(DataProducerPluginCachingInterface $plugin, Res
    * @return string
    */
   protected function edgeCachePrefix(DataProducerPluginCachingInterface $plugin) {
-    $id = $plugin->getPluginId();
-    $keys = $this->contextsManager->convertTokensToKeys($plugin->getCacheContexts())->getKeys();
-
     try {
-      $vectors = $plugin->edgeCachePrefix();
+      $prefix = $plugin->edgeCachePrefix();
     }
     catch (\Exception $e) {
-      throw new \LogicException(sprintf('Failed to serialize edge cache vectors for plugin %s.', $id));
+      throw new \LogicException(sprintf('Failed to serialize edge cache vectors for plugin %s.', $plugin->getPluginId()));
     }
 
-    return md5(serialize([$id, $vectors, $keys]));
+    $contexts = $plugin->getCacheContexts();
+    $keys = $this->contextsManager->convertTokensToKeys($contexts)->getKeys();
+    return md5(serialize([$plugin->getPluginId(), $prefix, $keys]));
   }
 
   /**

src/Plugin/GraphQL/DataProducer/Entity/EntityLabel.php

@@ -4,6 +4,7 @@
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\graphql\GraphQL\Execution\ResolveContext;
+use Drupal\graphql\Plugin\DataProducerPluginCachingInterface;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 use GraphQL\Type\Definition\ResolveInfo;
 
@@ -22,7 +23,7 @@
  *   }
  * )
  */
-class EntityLabel extends DataProducerPluginBase {
+class EntityLabel extends DataProducerPluginBase implements DataProducerPluginCachingInterface {
 
   /**
    * @param \Drupal\Core\Entity\EntityInterface $entity