Use original sorting order in entity reference query. (#743)

Author: fubhy

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

@@ -109,11 +109,18 @@ public function resolveValues($value, array $args, ResolveContext $context, Reso
       $result = $value->execute();
       $metadata = $value->getMetaData('graphql_context');
 
+      if (isset($metadata['ids']) && $sorting = $metadata['ids']) {
+        $sorting = array_flip(array_values($sorting));
+        uasort($result, function ($a, $b) use ($sorting) {
+          return $sorting[$a] - $sorting[$b];
+        });
+      }
+
       if ($value->hasTag('revisions')) {
+        // If this is a revision query, the version ids are the array keys.
         return $this->resolveFromRevisionIds($type, array_keys($result), $metadata, $args, $context, $info);
       }
 
-      // If this is a revision query, the version ids are the array keys.
       return $this->resolveFromEntityIds($type, array_values($result), $metadata, $args, $context, $info);
     }
   }

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

@@ -40,23 +40,37 @@ public function getBaseQuery($value, array $args, ResolveContext $context, Resol
     if ($value instanceof ContentEntityInterface) {
       $query = parent::getBaseQuery($value, $args, $context, $info);
 
-      // Add the target field condition to the query.
-      $definition = $this->getPluginDefinition();
-      $key = $definition['entity_key'];
-      $field = $definition['field'];
-      $ids = array_map(function ($item) {
-        return $item['target_id'];
-      }, $value->get($field)->getValue());
-
+      $metadata = $query->getMetadata('graphql_context');
+      $ids = $metadata['ids'];
       if (empty($ids)) {
         return NULL;
       }
 
+      $definition = $this->getPluginDefinition();
+      $key = $definition['entity_key'];
       $operator = is_array($ids) ? 'IN' : '=';
       $query->condition($key, $ids, $operator);
 
       return $query;
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getQueryContext($value, array $args, ResolveContext $context, ResolveInfo $info) {
+    $context = parent::getQueryContext($value, $args, $context, $info);
+
+    // Add the target field condition to the query.
+    $definition = $this->getPluginDefinition();
+    $field = $definition['field'];
+    $ids = array_map(function ($item) {
+      return $item['target_id'];
+    }, $value->get($field)->getValue());
+
+    return [
+      'ids' => $ids,
+    ] + $context;
+  }
+
 }