Merge branch '3447229-sortkey-by-term' into '2.2.x'

Issue #3447229: SortKey by term weight for taxonomies - Apply supplied patch

See merge request !81

modules/graphql_compose_edges/src/EntityConnectionQueryHelper.php

@@ -243,6 +243,9 @@ class EntityConnectionQueryHelper implements ConnectionQueryHelperInterface {
       case 'PROMOTED':
         return 'promote';
 
+      case 'WEIGHT':
+        return 'weight';
+
       default:
         return $this->getEntityType()->getKey('id');
     }
@@ -277,6 +280,9 @@ class EntityConnectionQueryHelper implements ConnectionQueryHelperInterface {
       case 'PROMOTED':
         return isset($entity->promote) ? (int) $entity->get('promote')->value : 0;
 
+      case 'WEIGHT':
+        return isset($entity->weight) ? (int) $entity->get('weight')->value : 0;
+
       default:
         return $entity->id();
     }

modules/graphql_compose_edges/src/Plugin/GraphQLCompose/SchemaType/ConnectionSortKeys.php

@@ -46,6 +46,10 @@ class ConnectionSortKeys extends GraphQLComposeSchemaTypeBase {
           'value' => 'PROMOTED',
           'description' => (string) $this->t('Sort by promoted status.'),
         ],
+        'WEIGHT' => [
+          'value' => 'PROMOTED',
+          'description' => (string) $this->t('Sort by term weight.'),
+        ],
       ],
     ]);