fix(entity definition): Fix problems with entity form display context for entity definition data producers. (#998)

Author: rthideaway

src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields.php

@@ -126,21 +126,21 @@ public function resolve(
       if ($bundle_context) {
         $key = $bundle_context['key'];
         $id = $entity_definition->id();
-        $entity_id = $id . '.' . $id . '.' . $key;
         $fields = $this->entityFieldManager->getFieldDefinitions($id, $key);
+
+        // Set entity form default display as context.
+        $entity_id = $id . '.' . $key . '.default';
+        /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $form_display_context */
+        $form_display_context = $this->entityTypeManager
+          ->getStorage('entity_form_display')
+          ->load($entity_id);
+        $field_context->setContextValue('entity_form_display', $form_display_context);
       }
       else {
         $id = $entity_definition->id();
-        $entity_id = $id . '.' . $id . '.default';
         $fields = $this->entityFieldManager->getFieldDefinitions($id, $id);
       }
 
-      /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $form_display_context */
-      $form_display_context = $this->entityTypeManager
-        ->getStorage('entity_form_display')
-        ->load($entity_id);
-
-      $field_context->setContextValue('entity_form_display', $form_display_context);
       if ($field_types_context) {
         $field_types = $field_types_context['key'];
         foreach ($fields as $field) {

src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields/Hidden.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\EntityDefinition\Fields;
 
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
@@ -33,19 +34,18 @@ class Hidden extends DataProducerPluginBase {
    *
    * @param \Drupal\Core\Field\FieldDefinitionInterface $entity_definition_field
    *   The entity field definition.
-   * @param array|null $entity_form_display_context
+   * @param \Drupal\Core\Entity\Entity\EntityFormDisplay|null $entity_form_display_context
    *   Entity form display context.
    *
    * @return bool
    *   If the field is hidden or not.
    */
   public function resolve(
     FieldDefinitionInterface $entity_definition_field,
-    ?array $entity_form_display_context = NULL
+    ?EntityFormDisplay $entity_form_display_context
   ): bool {
     if ($entity_form_display_context) {
-      $entity_form_display = $entity_form_display_context['key'];
-      $hidden = $entity_form_display->get('hidden');
+      $hidden = $entity_form_display_context->get('hidden');
       $field_id = $entity_definition_field->getName();
 
       if (isset($hidden[$field_id])) {

src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields/Settings.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\EntityDefinition\Fields;
 
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
@@ -33,21 +34,20 @@ class Settings extends DataProducerPluginBase {
    *
    * @param \Drupal\Core\Field\FieldDefinitionInterface $entity_definition_field
    *   The entity field definition.
-   * @param array|null $entity_form_display_context
+   * @param \Drupal\Core\Entity\Entity\EntityFormDisplay|null $entity_form_display_context
    *   Entity form display context.
    *
    * @return \Iterator
    *   Field settings.
    */
   public function resolve(
     FieldDefinitionInterface $entity_definition_field,
-    ?array $entity_form_display_context = NULL
+    ?EntityFormDisplay $entity_form_display_context
   ): \Iterator {
     $settings = $entity_definition_field->getSettings();
 
     if ($entity_form_display_context) {
-      $entity_form_display = $entity_form_display_context['key'];
-      $content = $entity_form_display->get('content');
+      $content = $entity_form_display_context->get('content');
       $field_id = $entity_definition_field->getName();
       if (isset($content[$field_id])) {
         $form_settings = $content[$field_id]['settings'];

src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields/Weight.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\EntityDefinition\Fields;
 
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
@@ -33,19 +34,18 @@ class Weight extends DataProducerPluginBase {
    *
    * @param \Drupal\Core\Field\FieldDefinitionInterface $entity_definition_field
    *   The entity field definition.
-   * @param array|null $entity_form_display_context
+   * @param \Drupal\Core\Entity\Entity\EntityFormDisplay|null $entity_form_display_context
    *   Entity form display context.
    *
    * @return int
    *   The field weight.
    */
   public function resolve(
     FieldDefinitionInterface $entity_definition_field,
-    ?array $entity_form_display_context = NULL
+    ?EntityFormDisplay $entity_form_display_context
   ): int {
     if ($entity_form_display_context) {
-      $entity_form_display = $entity_form_display_context['key'];
-      $content = $entity_form_display->get('content');
+      $content = $entity_form_display_context->get('content');
       $field_id = $entity_definition_field->getName();
 
       if (isset($content[$field_id])) {