Fix errors in composer container page

assets/scss/composer.scss

@@ -396,15 +396,19 @@ $color_red: #f56954;
   margin-top: 11px;
 }
 
-.page-composer__container__child__edit {
+.page-composer__container__child__edit,
+.page-composer__container__child__error {
   border-left: 3px solid #f9f9f9;
   color: #404040 !important;
-  cursor: pointer;
   display: block;
   padding: 10px 15px 10px 27px;
   text-decoration: none !important;
 }
 
+.page-composer__container__child__edit {
+  cursor: pointer;
+}
+
 .page-composer__container__child__right {
   position: absolute;
   right: 5px;

src/Admin/BlockAdmin.php

@@ -172,25 +172,25 @@ protected function configureFormFields(FormMapper $form): void
                 $form->add('position', IntegerType::class);
             }
 
-            $form->end();
-
-            $form->with('options', $optionsGroupOptions);
-
-            $this->configureBlockFields($form, $block);
-
             if (false !== $isComposer) {
                 $form->add('enabled', HiddenType::class, ['data' => true]);
             } else {
                 $form->add('enabled');
             }
 
             $form->end();
+
+            $form->with('options', $optionsGroupOptions);
+
+            $this->configureBlockFields($form, $block);
+
+            $form->end();
         } else {
             $form
                 ->with('options', $optionsGroupOptions)
-                ->add('type', ServiceListType::class, ['context' => 'sonata_page_bundle'])
-                ->add('enabled')
-                ->add('position', IntegerType::class)
+                    ->add('type', ServiceListType::class, ['context' => 'sonata_page_bundle'])
+                    ->add('enabled')
+                    ->add('position', IntegerType::class)
                 ->end();
         }
     }

src/Resources/views/BlockAdmin/compose_preview.html.twig

@@ -4,29 +4,49 @@
     data-block-enabled="{{ child.enabled|default('0') }}"
     data-block-type="{{ child.type }}"
 >
-    <a class="page-composer__container__child__edit"
-       href="{{ blockAdmin.generateUrl('edit', { 'id': child.id, 'composer': true }) }}"
+    {% set service = attribute(blockServices, child.type) ?? null %}
+
+    {% if service %}
+    <a
+        class="page-composer__container__child__edit"
+        href="{{ blockAdmin.generateUrl('edit', { 'id': child.id, 'composer': true }) }}"
     >
-        {% set service = attribute(blockServices, child.type) %}
-        {% if service.metadata is defined %}
-            {% set metadata = service.metadata %}
+    {% else %}
+    <div class="page-composer__container__child__error">
+    {% endif %}
+        {% if service %}
+            {% set metadataTitle = service.metadata.title|trans({}, service.metadata.domain|default('SonataPageBundle')) %}
+            {% set blockTitle = child.name|default(metadataTitle) %}
+            {% set blockImage = service.metadata.image ? asset(service.metadata.image) : null %}
+            {% set blockClass = service.metadata.option('class') %}
         {% else %}
-            {% set metadata = service.blockMetadata %}
+            {% set metadataTitle = child.type %}
+            {% set blockTitle = child.name %}
+            {% set blockImage = null %}
+            {% set blockClass = null %}
         {% endif %}
-        <h4 class="page-composer__container__child__name">
-            {{ child.name|default(metadata.title)|trans({}, metadata.domain|default('SonataPageBundle')) }}
-        </h4>
-        {% if not metadata.image %}
-            <i class="{{ metadata.option('class') }}" ></i>
-        {% else %}
-            <img src="{{ asset(metadata.image) }}" style="max-height: 20px; max-width: 100px;"/>
+
+        <h4 class="page-composer__container__child__name">{{ blockTitle }}</h4>
+
+        {% if blockImage %}
+            <img src="{{ blockImage }}" style="max-height: 20px; max-width: 100px;"/>
+        {% elseif blockClass %}
+            <i class="{{ blockClass }}" ></i>
         {% endif %}
-        <small>{{ metadata.title|trans({}, metadata.domain|default('SonataPageBundle')) }}</small>
-        <span class="page-composer__container__child__toggle">
-            <i class="fa fa-chevron-down"></i>
-            <i class="fa fa-chevron-up"></i>
-        </span>
+
+        <small>{{ metadataTitle }}</small>
+
+        {% if service %}
+            <span class="page-composer__container__child__toggle">
+                <i class="fa fa-chevron-down"></i>
+                <i class="fa fa-chevron-up"></i>
+            </span>
+        {% endif %}
+    {% if service %}
     </a>
+    {% else %}
+    </div>
+    {% endif %}
 
     <div class="page-composer__container__child__right">
         <div class="page-composer__container__child__remove">
@@ -45,7 +65,8 @@
                     'context': 'list',
                     'field': 'enabled',
                     '_sonata_admin': 'sonata.page.admin.block'
-                }) }}">
+                }) }}"
+            >
                     {% if child.enabled %}{{ 'composer.disable'|trans({}, 'SonataPageBundle') }}
                         <i class="fa fa-toggle-off"></i>
                     {% else %}
@@ -60,8 +81,7 @@
         </div>
     </div>
 
-    <div class="page-composer__container__child__content">
-    </div>
+    <div class="page-composer__container__child__content"></div>
 
     <div class="page-composer__container__child__loader">
         <span>{{ 'loading'|trans({}, 'SonataPageBundle') }}</span>

tests/Functional/Admin/BlockAdminTest.php

@@ -16,6 +16,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Sonata\PageBundle\Tests\App\Entity\SonataPageBlock;
 use Sonata\PageBundle\Tests\App\Entity\SonataPagePage;
+use Sonata\PageBundle\Tests\App\Entity\SonataPageSite;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 final class BlockAdminTest extends WebTestCase
@@ -52,7 +53,7 @@ public static function provideCrudUrlsCases(): iterable
 
         yield 'Edit Block' => ['/admin/tests/app/sonatapageblock/1/edit'];
         yield 'Remove Block' => ['/admin/tests/app/sonatapageblock/1/delete'];
-        yield 'Compose preview Block' => ['/admin/tests/app/sonatapageblock/3/compose-preview'];
+        yield 'Compose preview Block' => ['/admin/tests/app/sonatapageblock/2/compose-preview'];
     }
 
     /**
@@ -233,9 +234,14 @@ private function prepareData(): void
         $manager = $container->get('doctrine.orm.entity_manager');
         \assert($manager instanceof EntityManagerInterface);
 
+        $site = new SonataPageSite();
+        $site->setName('name');
+        $site->setHost('localhost');
+
         $page = new SonataPagePage();
         $page->setName('name');
         $page->setTemplateCode('default');
+        $page->setSite($site);
 
         $parentBlock = new SonataPageBlock();
         $parentBlock->setType('sonata.page.block.container');
@@ -245,13 +251,13 @@ private function prepareData(): void
 
         $block = new SonataPageBlock();
         $block->setType('sonata.block.service.text');
-        $block->setParent($parentBlock);
 
         $page->addBlock($parentBlock);
         $page->addBlock($parentBlock2);
+        $parentBlock->addChild($block);
 
+        $manager->persist($site);
         $manager->persist($page);
-        $manager->persist($block);
 
         $manager->flush();
     }

tests/Functional/Admin/PageAdminTest.php

@@ -58,7 +58,7 @@ public static function provideCrudUrlsCases(): iterable
         yield 'Show Page' => ['/admin/tests/app/sonatapagepage/1/show'];
         yield 'Remove Page' => ['/admin/tests/app/sonatapagepage/1/delete'];
         yield 'Compose Page' => ['/admin/tests/app/sonatapagepage/1/compose'];
-        yield 'Compose Show Page' => ['/admin/tests/app/sonatapagepage/compose/container/1'];
+        yield 'Compose Container Page' => ['/admin/tests/app/sonatapagepage/compose/container/1'];
 
         // Snapshot child pages
         yield 'List Snapshot Page' => ['/admin/tests/app/sonatapagepage/1/sonatapagesnapshot/list'];
@@ -296,10 +296,13 @@ private function prepareData(): void
 
         $block = new SonataPageBlock();
         $block->setType('sonata.block.service.text');
-        $block->setParent($parentBlock);
+
+        $block2 = new SonataPageBlock();
+        $block2->setType('non_existent_block');
 
         $page->addBlock($parentBlock);
-        $page->addBlock($block);
+        $parentBlock->addChild($block);
+        $parentBlock->addChild($block2);
 
         $manager->persist($site);
         $manager->persist($site2);

tests/Functional/Command/CloneSiteCommandTest.php

@@ -139,10 +139,9 @@ private function prepareData(): void
 
         $block = new SonataPageBlock();
         $block->setType('sonata.block.service.text');
-        $block->setParent($parentBlock);
 
         $page->addBlock($parentBlock);
-        $page->addBlock($block);
+        $parentBlock->addChild($block);
 
         $manager->persist($site);
         $manager->persist($site2);

tests/Functional/Frontend/PageTest.php

@@ -199,10 +199,9 @@ public static function providePages(): iterable
             $block = new SonataPageBlock();
             $block->setType('sonata.block.service.text');
             $block->setSetting('content', 'Footer content');
-            $block->setParent($containerBlock);
 
             $page->addBlock($containerBlock);
-            $page->addBlock($block);
+            $containerBlock->addChild($block);
 
             return $page;
         })(), '/random_route', 404, ['Footer content'], []];
@@ -257,20 +256,21 @@ private function prepareData(): void
         $block = new SonataPageBlock();
         $block->setType('sonata.page.block.shared_block');
         $block->setSetting('blockId', 3);
-        $block->setParent($containerBlock);
 
         $block2 = new SonataPageBlock();
         $block2->setType('sonata.page.block.pagelist');
-        $block2->setParent($containerBlock);
 
         $block3 = new SonataPageBlock();
         $block3->setType('sonata.page.block.children_pages');
         $block3->setSetting('pageId', 1);
-        $block3->setParent($containerBlock);
 
         $block4 = new SonataPageBlock();
         $block4->setType('sonata.page.block.breadcrumb');
-        $block4->setParent($containerBlock);
+
+        $containerBlock->addChild($block);
+        $containerBlock->addChild($block2);
+        $containerBlock->addChild($block3);
+        $containerBlock->addChild($block4);
 
         $page->addBlock($containerBlock);
         $page->addBlock($block);
@@ -308,7 +308,8 @@ private function preparePageTypesData(PageInterface $page): void
         $block = new SonataPageBlock();
         $block->setType('sonata.block.service.text');
         $block->setSetting('content', 'Page content');
-        $block->setParent($containerBlock);
+
+        $containerBlock->addChild($block);
 
         $page->setSite($site);
         $page->addBlock($containerBlock);
@@ -363,17 +364,15 @@ private function prepareGlobalPageData(): void
         $block = new SonataPageBlock();
         $block->setType('sonata.block.service.text');
         $block->setSetting('content', 'Footer content');
-        $block->setParent($containerBlock);
 
         $block2 = new SonataPageBlock();
         $block2->setType('sonata.block.service.text');
         $block2->setSetting('content', 'Page content');
-        $block2->setParent($containerBlock2);
 
         $page->addBlock($containerBlock);
-        $page->addBlock($block);
         $page2->addBlock($containerBlock2);
-        $page2->addBlock($block2);
+        $containerBlock->addChild($block);
+        $containerBlock2->addChild($block2);
 
         $manager->persist($site);
         $manager->persist($page);

tests/Functional/Frontend/SnapshotTest.php

@@ -258,7 +258,8 @@ private function prepareSnapshotTypesData(PageInterface $page): void
         $block = new SonataPageBlock();
         $block->setType('sonata.block.service.text');
         $block->setSetting('content', 'Page content');
-        $block->setParent($containerBlock);
+
+        $containerBlock->addChild($block);
 
         $page->setSite($site);
         $page->addBlock($containerBlock);
@@ -313,17 +314,15 @@ private function prepareGlobalSnapshotData(): void
         $block = new SonataPageBlock();
         $block->setType('sonata.block.service.text');
         $block->setSetting('content', 'Footer content');
-        $block->setParent($containerBlock);
 
         $block2 = new SonataPageBlock();
         $block2->setType('sonata.block.service.text');
         $block2->setSetting('content', 'Page content');
-        $block2->setParent($containerBlock2);
 
         $page->addBlock($containerBlock);
-        $page->addBlock($block);
         $page2->addBlock($containerBlock2);
-        $page2->addBlock($block2);
+        $containerBlock->addChild($block);
+        $containerBlock2->addChild($block2);
 
         $manager->persist($site);
         $manager->persist($page);