MAGETWO-52105: Edit category does not work

Author: NadiyaS

lib/internal/Magento/Framework/EntityManager/MetadataPool.php

@@ -106,4 +106,15 @@ public function getHydrator($entityType)
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         return $objectManager->get(HydratorPool::class)->getHydrator($entityType);
     }
+
+    /**
+     * Check if entity type configuration was set to metadata
+     *
+     * @param string $entityType
+     * @return bool
+     */
+    public function hasConfiguration($entityType)
+    {
+        return isset($this->metadata[$entityType]);
+    }
 }

lib/internal/Magento/Framework/EntityManager/TypeResolver.php

@@ -10,6 +10,20 @@
  */
 class TypeResolver
 {
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * TypeResolver constructor.
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(MetadataPool $metadataPool)
+    {
+        $this->metadataPool = $metadataPool;
+    }
+
     /**
      * @var array
      */
@@ -45,6 +59,12 @@ public function resolve($type)
             throw new \Exception('Unable to determine data interface for ' . $className);
         }
 
-        return reset($dataInterfaces);
+        foreach ($dataInterfaces as $dataInterface) {
+            if ($this->metadataPool->hasConfiguration($dataInterface)) {
+                break;
+            }
+        }
+
+        return $dataInterface;
     }
 }