Add media entity to typed data preserving data-media-* attributes. (#75)

AmazeeLabs · Aug 12, 2019 · 5ea5717 · 5ea5717
1 parent 2e3d6de
commit 5ea5717
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 23 deletions.
diff --git a/src/DocumentConverter.php b/src/DocumentConverter.php
@@ -401,31 +401,24 @@ public function buildSectionData(\DOMNode $node, array &$sections_list, Document
               if ($item_field_definition->getPropertyDefinition($attributeName)) {
                 $item_field_data->set($attributeName, $node->getAttribute($attribute->nodeName));
               }
-              if ($attributeName == 'data-media-type') {
-                $entityType = $node->getAttribute($attribute->nodeName);
+              if ($attributeName == 'data-media-uuid') {
+                // Support for media entities.
+                $entities = $this->entityTypeManager
+                  ->getStorage('media')
+                  ->loadByProperties([
+                    'uuid' => $node->getAttribute('data-media-uuid'),
+                  ]);
+                $media = reset($entities);
+                if (!$media) {
+                  // FALSE can break GraphQL. NULL is safer.
+                  $media = NULL;
+                }
+                $item_field_data->set('entity', $media);
               }
             }
 
             $new_parent = $item_field_data;
           }
-          elseif (strpos($value['item_type'], 'entity:') === 0) {
-            $entity_type_id = substr($value['item_type'], strlen('entity:'));
-            // Support media entities.
-            try {
-              $entities = $this->entityTypeManager
-                ->getStorage($entity_type_id)
-                ->loadByProperties([
-                  'uuid' => $node->getAttribute('data-media-uuid'),
-                ]);
-              $item_field_data = reset($entities);
-              if (!$item_field_data) {
-                $item_field_data = NULL;
-              }
-            }
-            catch (\Exception $e) {
-              $item_field_data = NULL;
-            }
-          }
           else {
             // If the field is just a simple (scalar) field, then we just dump
             // the entire html of the node in it for now.

diff --git a/tests/src/Kernel/DocumentConverterTest.php b/tests/src/Kernel/DocumentConverterTest.php
@@ -38,6 +38,7 @@ class DocumentConverterTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
     $this->installConfig(['ckeditor5_sections']);
+    $this->installEntitySchema('media');
   }
 
   /**

diff --git a/tests/src/Kernel/assets/data/page.json b/tests/src/Kernel/assets/data/page.json
@@ -7,7 +7,8 @@
       "content": {
         "__type": "media",
         "data-media-type": "image",
-        "data-media-uuid": "123"
+        "data-media-uuid": "123",
+        "entity": null
       },
       "caption": "Caption"
     },
@@ -26,7 +27,8 @@
       "image": {
         "__type": "teaser-image",
         "data-media-type": "media:image",
-        "data-media-uuid": "123"
+        "data-media-uuid": "123",
+        "entity": null
       },
       "link": {
         "__type": "button",

diff --git a/tests/src/Kernel/assets/data/teaser.json b/tests/src/Kernel/assets/data/teaser.json
@@ -7,7 +7,8 @@
   "image": {
     "__type": "teaser-image",
     "data-media-type": "image",
-    "data-media-uuid": "123"
+    "data-media-uuid": "123",
+    "entity": null
   },
   "link": {
     "__type": "button",