refactor(container): Update type hinting and simplify content handling in DotCMSService and DotCMSExtension

- Changed import paths for PageAsset and NavigationItem to reflect updated structure.
- Updated generateHtmlBasedOnProperty method to accept Contentlet type, enhancing type safety.
- Simplified container content handling in Twig template by directly using container properties.

Author: fmontes

examples/dotcms-symfony/src/Service/DotCMSService.php

@@ -3,8 +3,8 @@
 namespace App\Service;
 
 use Dotcms\PhpSdk\DotCMSClient;
-use Dotcms\PhpSdk\Model\PageAsset;
-use Dotcms\PhpSdk\Model\NavigationItem;
+use Dotcms\PhpSdk\Model\Page\PageAsset;
+use Dotcms\PhpSdk\Model\Content\NavigationItem;
 
 class DotCMSService
 {

examples/dotcms-symfony/src/Twig/DotCMSExtension.php

@@ -3,6 +3,7 @@
 namespace App\Twig;
 
 use Dotcms\PhpSdk\Utils\DotCmsHelper;
+use Dotcms\PhpSdk\Model\Content\Contentlet;
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
@@ -20,7 +21,6 @@ public function getFunctions(): array
     {
         return [
             new TwigFunction('getGridClass', [$this, 'getGridClass']),
-            new TwigFunction('getContainersData', [$this, 'getContainersData']),
             new TwigFunction('generateHtmlBasedOnProperty', [$this, 'generateHtmlBasedOnProperty'], ['is_safe' => ['html']]),
             new TwigFunction('htmlAttr', [$this, 'htmlAttr'], ['is_safe' => ['html']])
         ];
@@ -40,31 +40,22 @@ public function getGridClass(int $position, string $type = 'start'): string
         };
     }
 
-    public function generateHtmlBasedOnProperty(array $content): string 
+    public function generateHtmlBasedOnProperty(Contentlet $content): string 
     {
-        if (!isset($content->contentType)) {
+        if (empty($content)) {
             return '';
         }
 
-        $twig = $this->twig;
-        $template = match($content->contentType) {
-            'Banner' => 'dotcms/content-types/banner.twig',
-            'Product' => 'dotcms/content-types/product.twig',
-            'Activity' => 'dotcms/content-types/activity.twig',
-            default => ''
-        };
-
-        if (empty($template)) {
-            // Fall back to the SDK simple content HTML renderer if no template is found
-            return DotCmsHelper::simpleContentHtml($content);
+        $contentType = $content->contentType;
+        if ($contentType) {
+            $template = 'dotcms/content-types/' . strtolower($contentType) . '.twig';
+            if ($this->twig->getLoader()->exists($template)) {
+                return $this->twig->render($template, ['content' => $content]);
+            }
         }
 
-        try {
-            return $twig->render($template, ['content' => $content]);
-        } catch (\Exception $e) {
-            // Fall back to the SDK simple content HTML renderer if rendering fails
-            return DotCmsHelper::simpleContentHtml($content);
-        }
+        // Fall back to the SDK simple HTML renderer
+        return DotCmsHelper::simpleContentHtml($content->jsonSerialize());
     }
 
     public function getContainersData(array $containers, array $containerRef): array 

examples/dotcms-symfony/templates/dotcms/container.twig

@@ -1,16 +1,13 @@
-{% set containerObject = getContainersData(containers, container) %}
-{% set containerContent = containers[container.identifier].contentlets['uuid-' ~ container.uuid]|default([]) %}
-
 {% set containerAttrs = {
     'data-dot-object': 'container',
-    'data-dot-identifier': containerObject.path|default(containerObject.identifier),
-    'data-dot-accept-types': containerObject.acceptTypes,
-    'data-max-contentlets': containerObject.maxContentlets,
+    'data-dot-identifier': container.identifier,
+    'data-dot-accept-types': container.acceptTypes,
+    'data-max-contentlets': container.maxContentlets,
     'data-dot-uuid': container.uuid
 } %}
 
 <div {{ htmlAttr(containerAttrs) }}>
-    {% for content in containerContent %}
+    {% for content in container.contentlets %}
         {% set contentAttrs = {
             'data-dot-object': 'contentlet',
             'data-dot-identifier': content.identifier,
@@ -19,10 +16,10 @@
             'data-dot-inode': content.inode,
             'data-dot-type': content.contentType,
             'data-dot-container': {
-                'acceptTypes': containerObject.acceptTypes,
-                'identifier': containerObject.path|default(containerObject.identifier),
-                'maxContentlets': containerObject.maxContentlets,
-                'variantId': containerObject.variantId,
+                'acceptTypes': container.acceptTypes,
+                'identifier': container.identifier,
+                'maxContentlets': container.maxContentlets,
+                'variantId': container.variantId,
                 'uuid': container.uuid
             }|json_encode
         } %}