Merge pull request #2 from dotCMS/fix-containers-data-attr

Fix containers data attr

Author: fmontes

examples/dotcms-laravel/app/Helpers/DotCmsHelpers.php

@@ -3,6 +3,7 @@
 namespace App\Helpers;
 
 use Dotcms\PhpSdk\Utils\DotCmsHelper;
+use Illuminate\Support\Facades\Log;
 
 class DotCmsHelpers
 {
@@ -15,7 +16,22 @@ class DotCmsHelpers
      */
     public function getContainersData($containers, $container)
     {
-        return DotCmsHelper::getContainerData($containers, $container);
+        $containerData = DotCmsHelper::getContainerData($containers, $container);
+        
+        if (!$containerData) {
+            return [
+                'contentlets' => [],
+                'acceptTypes' => '',
+                'maxContentlets' => 0,
+                'variantId' => null
+            ];
+        }
+        
+        if (empty($containerData['contentlets'])) {
+            Log::warning("No contentlets found for container: " . ($container['identifier'] ?? 'unknown') . ", uuid: " . ($container['uuid'] ?? 'unknown'));
+        }
+        
+        return $containerData;
     }
 
     /**

examples/dotcms-laravel/resources/views/layouts/container.blade.php

@@ -1,9 +1,6 @@
 @php
 $containerObject = $dotCmsHelpers->getContainersData($containers, $container);
-$containerContentKey = 'uuid-' . $container['uuid'];
-$containerContent = isset($containerObject['contentlets'][$containerContentKey]) 
-    ? $containerObject['contentlets'][$containerContentKey] 
-    : [];
+$containerContent = $containerObject['contentlets'] ?? [];
 
 $containerAttrs = [
     'data-dot-object' => 'container',

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

@@ -69,32 +69,16 @@ public function generateHtmlBasedOnProperty(array $content): string
 
     public function getContainersData(array $containers, array $containerRef): array 
     {
-        // First try to get the container data using the SDK helper
         $containerData = DotCmsHelper::getContainerData($containers, $containerRef);
 
         if (!$containerData) {
             throw new RuntimeException("Container not found: " . ($containerRef['identifier'] ?? 'unknown'));
         }
 
-        $identifier = $containerRef['identifier'] ?? throw new RuntimeException("Missing container identifier");
-        $uuid = $containerRef['uuid'] ?? throw new RuntimeException("Missing container UUID");
-        
-        $structures = $containerData['containerStructures'] ?? [];
-        $container = $containerData['container'] ?? [];
-        
-        $contentlets = $containerData['contentlets']["uuid-$uuid"] 
-            ?? $containerData['contentlets']["uuid-dotParser_$uuid"] 
-            ?? [];
-        
-        if (empty($contentlets)) {
-            error_log("No contentlets found for container: $identifier, uuid: $uuid");
+        if (empty($containerData['contentlets'])) {
+            error_log("No contentlets found for container: " . ($containerRef['identifier'] ?? 'unknown') . ", uuid: " . ($containerRef['uuid'] ?? 'unknown'));
         }
 
-        return [
-            ...$container,
-            'acceptTypes' => implode(',', array_column($structures, 'contentTypeVar')),
-            'contentlets' => $contentlets,
-            'variantId' => $container['parentPermissionable']['variantId'] ?? null
-        ];
+        return $containerData;
     }
 } 

src/Utils/DotCmsHelper.php

@@ -21,6 +21,7 @@ public static function getContainerData(array $containers, array $container): ?a
         }
 
         $identifier = $container['identifier'] ?? null;
+        $uuid = $container['uuid'] ?? null;
 
         if (! $identifier || ! isset($containers[$identifier])) {
             return null;
@@ -30,7 +31,25 @@ public static function getContainerData(array $containers, array $container): ?a
             return null;
         }
 
-        return $containers[$identifier];
+        $containerData = $containers[$identifier];
+        $structures = $containerData['containerStructures'] ?? [];
+        $container = $containerData['container'] ?? [];
+
+        $contentlets = [];
+        if ($uuid !== null && (is_string($uuid) || is_numeric($uuid))) {
+            $uuidStr = (string) $uuid;
+            $contentlets = $containerData['contentlets']["uuid-$uuidStr"]
+                ?? $containerData['contentlets']["uuid-dotParser_$uuidStr"]
+                ?? [];
+        }
+
+        return [
+            ...$container,
+            'acceptTypes' => implode(',', array_column($structures, 'contentTypeVar')),
+            'contentlets' => $contentlets,
+            'maxContentlets' => $container['maxContentlets'] ?? 0,
+            'variantId' => $container['parentPermissionable']['variantId'] ?? null,
+        ];
     }
 
     /**

tests/Utils/DotCmsHelperTest.php

@@ -10,13 +10,34 @@ class DotCmsHelperTest extends TestCase
     public function testGetContainerData(): void
     {
         $containers = [
-            'abc123' => ['title' => 'Test Container'],
+            'abc123' => [
+                'container' => ['title' => 'Test Container'],
+                'containerStructures' => [
+                    ['contentTypeVar' => 'Banner'],
+                    ['contentTypeVar' => 'Widget'],
+                ],
+                'contentlets' => [
+                    'uuid-123' => [
+                        ['title' => 'Test Content'],
+                    ],
+                ],
+            ],
             'def456' => ['title' => 'Another Container'],
         ];
 
-        $container = ['identifier' => 'abc123'];
+        // Test with valid container
+        $container = [
+            'identifier' => 'abc123',
+            'uuid' => '123',
+        ];
         $result = DotCmsHelper::getContainerData($containers, $container);
-        $this->assertEquals(['title' => 'Test Container'], $result);
+        $this->assertEquals([
+            'title' => 'Test Container',
+            'acceptTypes' => 'Banner,Widget',
+            'contentlets' => [['title' => 'Test Content']],
+            'maxContentlets' => 0,
+            'variantId' => null,
+        ], $result);
 
         // Test with non-existent identifier
         $container = ['identifier' => 'nonexistent'];