Fix embeddedList in NEW views

alterphp · May 14, 2018 · c76cdc2 · c76cdc2
1 parent fba7a00
commit c76cdc2
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 17 deletions.
diff --git a/src/Form/Type/EasyAdminEmbeddedListType.php b/src/Form/Type/EasyAdminEmbeddedListType.php
@@ -2,7 +2,6 @@
 
 namespace AlterPHP\EasyAdminExtensionBundle\Form\Type;
 
-use Doctrine\ORM\PersistentCollection as OrmPersistentCollection;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
@@ -32,27 +31,25 @@ public function getBlockPrefix()
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $data = $form->getData();
+        $parentData = $form->getParent()->getData();
 
         $embeddedListEntity = $options['entity'];
         $embeddedListFilters = $options['filters'];
 
-        if ($data instanceof OrmPersistentCollection) {
-            $entityFqcn = $data->getTypeClass()->getName();
+        // Guess entity FQCN from parent metadata
+        $entityFqcn = $this->embeddedListHelper->getEntityFqcnFromParent(get_class($parentData), $form->getName());
 
-            // Guess embeddedList entity if not set
-            if (!isset($embeddedListEntity)) {
-                $embeddedListEntity = $this->embeddedListHelper->guessEntityEntry($entityFqcn);
-            }
-
-            // Guess default filter and let it be overriden by defined filters
-            $embeddedListFilters = array_merge(
-                $this->embeddedListHelper->guessDefaultFilter(
-                    $entityFqcn, $form->getConfig()->getName(), $data->getOwner()
-                ),
-                $embeddedListFilters
-            );
+        // Guess embeddedList entity if not set
+        if (!isset($embeddedListEntity)) {
+            $embeddedListEntity = $this->embeddedListHelper->guessEntityEntry($entityFqcn);
         }
 
+        // Guess default filter and let it be overriden by defined filters
+        $embeddedListFilters = array_merge(
+            $this->embeddedListHelper->guessDefaultFilter($entityFqcn, $form->getConfig()->getName(), $parentData),
+            $embeddedListFilters
+        );
+
         $view->vars['entity'] = $embeddedListEntity;
 
         $propertyAccessor = PropertyAccess::createPropertyAccessor();

diff --git a/src/Helper/EmbeddedListHelper.php b/src/Helper/EmbeddedListHelper.php
@@ -33,6 +33,34 @@ public function __construct(ManagerRegistry $doctrine, array $easyAdminConfig)
         $this->easyAdminConfig = $easyAdminConfig;
     }
 
+    /**
+     * Returns EasyAdmin entity entry name for a parent FQCN and property for embedded list.
+     *
+     * @param string $parentFqcn
+     * @param string $parentProperty
+     *
+     * @return mixed
+     *
+     * @throws \RuntimeException
+     */
+    public function getEntityFqcnFromParent(string $parentFqcn, string $parentProperty)
+    {
+        $parentClassMetadata = $this->doctrine->getManagerForClass($parentFqcn)->getClassMetadata($parentFqcn);
+
+        // Required to use getAssociationMappings method
+        if (!$parentClassMetadata instanceof ClassMetadataInfo) {
+            return;
+        }
+
+        try {
+            $entityFqcn = $parentClassMetadata->getAssociationTargetClass($parentProperty);
+        } catch (\Exception $e) {
+            return;
+        }
+
+        return $entityFqcn;
+    }
+
     /**
      * Returns EasyAdmin entity entry name for a FQCN.
      *

diff --git a/tests/Configuration/EmbeddedListViewConfigPassTest.php b/tests/Configuration/EmbeddedListViewConfigPassTest.php
@@ -15,10 +15,10 @@ public function testOpenNewTabOption()
                 'NotSetEntity' => array(
                 ),
                 'SetTrueEntity' => array(
-                    'embeddedList' => array('open_new_tab' => true)
+                    'embeddedList' => array('open_new_tab' => true),
                 ),
                 'SetFalseEntity' => array(
-                    'embeddedList' => array('open_new_tab' => false)
+                    'embeddedList' => array('open_new_tab' => false),
                 ),
             ),
         );