[Data Object Editor] Consider doDelete when getting brick data (#912)

* consider doDelete when getting brick data

* Apply php-cs-fixer changes

Author: lukmzig

src/DataObject/Data/Adapter/ObjectBricksAdapter.php

@@ -100,22 +100,22 @@ public function normalize(
         }
 
         $resultItems = [];
-        $items = $value->getObjectVars();
-        foreach ($items as $item) {
+        $allowedTypes = $value->getAllowedBrickTypes();
+        foreach ($allowedTypes as $type) {
+            $resultItems[$type] = null;
+            $item = $value->get($type);
+
             if (!$item instanceof AbstractData) {
                 continue;
             }
 
-            $type = $item->getType();
-            $resultItems[$type] = [];
             $definition = $this->definitionResolver->getByKey($type);
             if ($definition === null) {
                 continue;
             }
 
             foreach ($definition->getFieldDefinitions() as $brickFieldDefinition) {
-                $getter = 'get' . ucfirst($brickFieldDefinition->getName());
-                $value = $item->$getter();
+                $value = $item->get($brickFieldDefinition->getName());
                 $resultItems[$type][$brickFieldDefinition->getName()] = $this->dataService->getNormalizedValue(
                     $value,
                     $brickFieldDefinition,
@@ -139,8 +139,7 @@ public function getFieldInheritance(
 
         $inheritanceData = [];
         foreach ($value->getAllowedBrickTypes() as $type) {
-            $brickGetter = 'get' . $type;
-            $brick = $value->$brickGetter();
+            $brick = $value->get($type);
             if (!$brick) {
                 continue;
             }
@@ -175,24 +174,30 @@ public function getPreviewFieldData(
             return $data;
         }
 
-        $items = $value->getObjectVars();
-        foreach ($items as $item) {
+        $allowedTypes = $value->getAllowedBrickTypes();
+        foreach ($allowedTypes as $type) {
+            $item = $value->get($type);
             if (!$item instanceof AbstractData) {
+                $data[$type] = null;
+
                 continue;
             }
 
-            $type = $item->getType();
-            $brickName = ucfirst($type);
             $definition = $this->definitionResolver->getByKey($type);
             if ($definition === null) {
+                $data[$type] = null;
+
                 continue;
             }
 
             foreach ($definition->getFieldDefinitions() as $brickFieldDefinition) {
-                $getter = 'get' . ucfirst($brickFieldDefinition->getName());
-                $fieldValues = $this->dataService->getPreviewFieldData($item->$getter(), $brickFieldDefinition, []);
+                $fieldValues = $this->dataService->getPreviewFieldData(
+                    $item->get($brickFieldDefinition->getName()),
+                    $brickFieldDefinition,
+                    []
+                );
                 foreach ($fieldValues as $fieldKey => $fieldValue) {
-                    $data[$brickName . ' - ' . $fieldKey] = $fieldValue;
+                    $data[ucfirst($type) . ' - ' . $fieldKey] = $fieldValue;
                 }
 
             }

src/DataObject/Service/DataService.php

@@ -109,12 +109,8 @@ public function getNormalizedValue(
     /**
      * {@inheritdoc}
      */
-    public function getPreviewObjectData(DataObjectModel $dataObject): array
+    public function getPreviewObjectData(Concrete $dataObject): array
     {
-        if (!$dataObject instanceof Concrete) {
-            return [];
-        }
-
         $class = $this->getValidClass($this->classDefinitionResolver, $dataObject->getClassId());
         $data = [];
         foreach ($class->getFieldDefinitions() as $key => $fieldDefinition) {

src/DataObject/Service/DataServiceInterface.php

@@ -50,7 +50,7 @@ public function getNormalizedValue(
     /**
      * @throws DatabaseException|NotFoundException
      */
-    public function getPreviewObjectData(DataObjectModel $dataObject): array;
+    public function getPreviewObjectData(Concrete $dataObject): array;
 
     /**
      * @throws DatabaseException|NotFoundException

src/Search/Hydrator/Preview/DataObjectHydrator.php

@@ -18,6 +18,7 @@
 
 use Pimcore\Bundle\StudioBackendBundle\DataObject\Service\DataServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Search\Schema\DataObjectSearchPreview;
+use Pimcore\Bundle\StudioBackendBundle\Security\Service\SecurityServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\User\Service\UserServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Util\Trait\ElementProviderTrait;
 use Pimcore\Model\DataObject;
@@ -33,7 +34,8 @@
 
     public function __construct(
         private DataServiceInterface $dataService,
-        private UserServiceInterface $userService
+        private SecurityServiceInterface $securityService,
+        private UserServiceInterface $userService,
     ) {
     }
 
@@ -54,10 +56,22 @@ public function hydrate(DataObject $dataObject): DataObjectSearchPreview
             $dataObject->getCreationDate(),
             $dataObject->getModificationDate(),
             $this->getClassData($dataObject),
-            $this->dataService->getPreviewObjectData($dataObject),
+            $this->hydratePreviewDetailData($dataObject),
         );
     }
 
+    private function hydratePreviewDetailData(DataObject $dataObject): array
+    {
+        $version = $this->getLatestVersionForUser($dataObject, $this->securityService->getCurrentUser());
+        $versionData = $this->getVersionData($dataObject, $version);
+
+        if (!$versionData instanceof Concrete) {
+            return [];
+        }
+
+        return $this->dataService->getPreviewObjectData($versionData);
+    }
+
     private function getClassData(DataObject $dataObject): ?string
     {
         if (!$dataObject instanceof Concrete) {