Merge remote-tracking branch 'origin/1.9' into 1.x

# Conflicts: # src/Processing/ImportProcessingService.php
pimcore · Dec 2, 2024 · d9c7d8a · d9c7d8a
2 parents 8882b01 + 5a08c98
commit d9c7d8a
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 8 deletions.
diff --git a/src/Mapping/DataTarget/Direct.php b/src/Mapping/DataTarget/Direct.php
@@ -152,12 +152,20 @@ protected function checkAssignData($newData, $valueContainer, $getter)
             $fieldName = $fieldNameParts[2];
         }
 
-        $fieldDefinition = $this->getFieldDefinition($valueContainer, $fieldName);
-        if ($this->writeIfTargetIsNotEmpty === false && !$fieldDefinition->isEmpty($currentData)) {
+        if ($this->fieldName === 'key') {
+            $currentDataIsEmpty = empty($currentData);
+            $newDataIsEmpty = empty($newData);
+        } else {
+            $fieldDefinition = $this->getFieldDefinition($valueContainer, $fieldName);
+            $currentDataIsEmpty = $fieldDefinition->isEmpty($currentData);
+            $newDataIsEmpty = $fieldDefinition->isEmpty($newData);
+        }
+
+        if ($this->writeIfTargetIsNotEmpty === false && !$currentDataIsEmpty) {
             return false;
         }
 
-        if ($this->writeIfSourceIsEmpty === false && $fieldDefinition->isEmpty($newData)) {
+        if ($this->writeIfSourceIsEmpty === false && $newDataIsEmpty) {
             return false;
         }
 

diff --git a/src/Processing/ImportProcessingService.php b/src/Processing/ImportProcessingService.php
@@ -228,6 +228,7 @@ protected function processElement(string $configName, array $importDataRow, Reso
                 $event = new PreSaveEvent($configName, $importDataRow, $element);
                 $this->eventDispatcher->dispatch($event);
 
+                $this->checkKey($element);
                 $element
                     ->setUserModification($userOwner)
                     ->save();
@@ -393,4 +394,11 @@ public function cancelImportAndCleanupQueue(string $configName): void
         TmpStore::delete($infoEntryId);
         $this->queueService->cleanupQueueItems($configName);
     }
+
+    private function checkKey(ElementInterface $element): void
+    {
+        if (empty($element->getKey())) {
+            $element->setKey(uniqid('import-', true));
+        }
+    }
 }
diff --git a/src/Resolver/Factory/DataObjectFactory.php b/src/Resolver/Factory/DataObjectFactory.php
@@ -15,6 +15,7 @@
 
 namespace Pimcore\Bundle\DataImporterBundle\Resolver\Factory;
 
+use Exception;
 use Pimcore\Bundle\DataImporterBundle\Exception\InvalidConfigurationException;
 use Pimcore\Model\DataObject\ClassDefinition;
 use Pimcore\Model\Element\ElementInterface;
@@ -42,6 +43,10 @@ public function setSubType(string $subType): void
         $this->subType = $subType;
     }
 
+    /**
+     * @throws InvalidConfigurationException
+     * @throws Exception
+     */
     public function createNewElement(): ElementInterface
     {
         $class = ClassDefinition::getById($this->subType);
@@ -52,12 +57,14 @@ public function createNewElement(): ElementInterface
         $className = '\\Pimcore\\Model\\DataObject\\' . ucfirst($class->getName());
         $element = $this->modelFactory->build($className);
 
-        if ($element instanceof ElementInterface) {
-            $element->setKey(uniqid('import-', true));
-
-            return $element;
+        if (!($element instanceof ElementInterface)) {
+            throw new InvalidConfigurationException(
+                "Object of class `{$this->subType}` could not be created."
+            );
         }
 
-        throw new InvalidConfigurationException("Object of class `{$this->subType}` could not be created.");
+        $element->setKey(uniqid('import-', true));
+
+        return $element;
     }
 }
diff --git a/src/Resolver/Resolver.php b/src/Resolver/Resolver.php
@@ -151,6 +151,15 @@ public function loadOrCreateAndPrepareElement(array $inputData, bool $createNew
 
         if (empty($element)) {
             $element = $this->getElementFactory()->createNewElement();
+            /**
+             * Reset key for new element, otherwise a key, that gets passed in the input data, would not be used.
+             * See checkKey method in ImportProcessingService, which adds the key again if necessary.
+             *
+             * @see \Pimcore\Bundle\DataImporterBundle\Processing\ImportProcessingService::checkKey
+             *
+             * Needs to be done here, because adding a parameter to createNewElement would be a bc break.
+             */
+            $element->setKey('');
             $this->getCreateLocationStrategy()->updateParent($element, $inputData);
             $justCreated = true;
         } else {