Merge remote-tracking branch 'origin/1.x' into 218-reset-password

config/assets.yaml

@@ -28,5 +28,5 @@ services:
   Pimcore\Bundle\StudioBackendBundle\Asset\Service\DataServiceInterface:
     class: Pimcore\Bundle\StudioBackendBundle\Asset\Service\DataService
 
-
-
+  Pimcore\Bundle\StudioBackendBundle\Asset\Updater\Adapter\ImageAdapter:
+    tags: [ 'pimcore.studio_backend.update_adapter' ]

src/Asset/Attributes/Property/UpdateAssetImage.php

@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Attributes\Property;
+
+use OpenApi\Attributes\Property;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image\ImageData;
+
+/**
+ * @internal
+ */
+final class UpdateAssetImage extends Property
+{
+    public function __construct()
+    {
+        parent::__construct(
+            'image',
+            ref: ImageData::class,
+            type: 'object',
+            nullable: true,
+        );
+    }
+}

src/Asset/Attributes/Request/UpdateAssetRequestBody.php

@@ -20,6 +20,7 @@
 use OpenApi\Attributes\JsonContent;
 use OpenApi\Attributes\Property;
 use OpenApi\Attributes\RequestBody;
+use Pimcore\Bundle\StudioBackendBundle\Asset\Attributes\Property\UpdateAssetImage;
 use Pimcore\Bundle\StudioBackendBundle\Property\Attributes\Property\UpdateElementProperties;
 
 /**
@@ -37,6 +38,7 @@ public function __construct()
                     new Property('data',
                         properties: [
                             new UpdateElementProperties(),
+                            new UpdateAssetImage(),
                         ],
                         type: 'object',
                     ),

src/Asset/Attributes/Response/Content/CustomSettingsJson.php

@@ -30,7 +30,7 @@ public function __construct()
         parent::__construct(
             properties: [
                 new Property(
-                    'customSettings',
+                    'items',
                     ref: CustomSettings::class,
                     type: 'object'
                 ),

src/Asset/Controller/CustomSettingsController.php

@@ -69,6 +69,6 @@ public function __construct(
     ])]
     public function getAssetCustomSettingsById(int $id): JsonResponse
     {
-        return $this->jsonResponse($this->customSettingsService->getCustomSettings($id));
+        return $this->jsonResponse(['items' => $this->customSettingsService->getCustomSettings($id)]);
     }
 }

src/Asset/Controller/UpdateController.php

@@ -19,7 +19,7 @@
 use OpenApi\Attributes\Put;
 use Pimcore\Bundle\StudioBackendBundle\Asset\Attributes\Request\UpdateAssetRequestBody;
 use Pimcore\Bundle\StudioBackendBundle\Asset\Attributes\Response\Content\OneOfAssetJson;
-use Pimcore\Bundle\StudioBackendBundle\Asset\Request\UpdateAsset;
+use Pimcore\Bundle\StudioBackendBundle\Asset\MappedParameter\UpdateAssetParameter;
 use Pimcore\Bundle\StudioBackendBundle\Asset\Service\AssetServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Path\IdParameter;
@@ -67,7 +67,7 @@ public function __construct(
         HttpResponseCodes::UNAUTHORIZED,
         HttpResponseCodes::NOT_FOUND,
     ])]
-    public function updateAsset(int $id, #[MapRequestPayload] UpdateAsset $updateAsset): JsonResponse
+    public function updateAsset(int $id, #[MapRequestPayload] UpdateAssetParameter $updateAsset): JsonResponse
     {
         $this->updateService->update('asset', $id, $updateAsset->getData());
         return $this->jsonResponse($this->assetService->getAsset($id));

src/Asset/Request/UpdateAsset.php → src/Asset/MappedParameter/UpdateAssetParameter.php

@@ -14,12 +14,12 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Asset\Request;
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\MappedParameter;
 
 /**
  * @internal
  */
-final readonly class UpdateAsset
+final readonly class UpdateAssetParameter
 {
     public function __construct(
         private array $data

src/Asset/Schema/Type/Image/FocalPoint.php

@@ -0,0 +1,49 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image;
+
+use OpenApi\Attributes\Property;
+use OpenApi\Attributes\Schema;
+
+/**
+ * @internal
+ */
+#[Schema(
+    title: 'FocalPoint',
+    type: 'object'
+)]
+final readonly class FocalPoint
+{
+
+    public function __construct(
+        #[Property(description: 'x', type: 'integer', example: 50)]
+        private int $x,
+        #[Property(description: 'y', type: 'integer', example: 50)]
+        private int $y,
+    ) {
+    }
+
+    public function getX(): int
+    {
+        return $this->x;
+    }
+
+    public function getY(): int
+    {
+        return $this->y;
+    }
+}

src/Asset/Schema/Type/Image/ImageData.php

@@ -0,0 +1,41 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image;
+
+use OpenApi\Attributes\Property;
+use OpenApi\Attributes\Schema;
+
+/**
+ * @internal
+ */
+#[Schema(
+    title: 'ImageData',
+    type: 'object'
+)]
+final readonly class ImageData
+{
+    public function __construct(
+        #[Property(ref: FocalPoint::class, description: 'focalPoint', type: 'object')]
+        private array $focalPoint,
+    ) {
+    }
+
+    public function getFocalPoint(): array
+    {
+        return $this->focalPoint;
+    }
+}

src/Asset/Updater/Adapter/ImageAdapter.php

@@ -0,0 +1,69 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Asset\Updater\Adapter;
+
+use Pimcore\Bundle\StudioBackendBundle\Updater\Adapter\UpdateAdapterInterface;
+use Pimcore\Bundle\StudioBackendBundle\Util\Constants\ElementTypes;
+use Pimcore\Model\Asset\Image;
+use Pimcore\Model\Element\ElementInterface;
+use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
+
+/**
+ * @internal
+ */
+#[AutoconfigureTag('pimcore.studio_backend.update_adapter')]
+final readonly class ImageAdapter implements UpdateAdapterInterface
+{
+    private const INDEX_KEY = 'image';
+
+    public function update(ElementInterface $element, array $data): void
+    {
+        if (!$element instanceof Image) {
+            return;
+        }
+
+        $this->checkFocalPoint($element, $data);
+
+    }
+
+    public function getIndexKey(): string
+    {
+        return self::INDEX_KEY;
+    }
+
+    public function supportedElementTypes(): array
+    {
+        return [
+            ElementTypes::TYPE_ASSET,
+        ];
+    }
+
+    private function checkFocalPoint(Image $image, array $data): void
+    {
+        if (
+            !array_key_exists(self::INDEX_KEY, $data) ||
+            !array_key_exists('focalPoint', $data[self::INDEX_KEY])
+        ) {
+            $image->removeCustomSetting('focalPointX');
+            $image->removeCustomSetting('focalPointY');
+            return;
+        }
+
+        $image->setCustomSetting('focalPointX', $data[self::INDEX_KEY]['focalPoint']['x']);
+        $image->setCustomSetting('focalPointY', $data[self::INDEX_KEY]['focalPoint']['y']);
+    }
+}

src/DataIndex/Filter/DataObject/ClassNameFilter.php

@@ -21,7 +21,7 @@
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\DataObjectQuery;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\DataObjectParametersInterface;
-use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\CollectionParametersInterface;
 
 /**
  * @internal

src/DataIndex/Filter/ExcludeFolderFilter.php

@@ -18,7 +18,7 @@
 
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\ElementParametersInterface;
-use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\CollectionParametersInterface;
 
 /**
  * @internal

src/DataIndex/Filter/FilterInterface.php

@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter;
 
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
-use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\CollectionParametersInterface;
 
 /**
  * @internal

src/DataIndex/Filter/IdSearchFilter.php

@@ -18,7 +18,7 @@
 
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\ElementParametersInterface;
-use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\CollectionParametersInterface;
 
 /**
  * @internal

src/DataIndex/Filter/PageFilter.php

@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter;
 
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
-use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\CollectionParametersInterface;
 
 /**
  * @internal

src/DataIndex/Filter/PageSizeFilter.php

@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter;
 
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
-use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\CollectionParametersInterface;
 
 /**
  * @internal

src/DataIndex/Filter/ParentIdFilter.php

@@ -18,7 +18,7 @@
 
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\ElementParametersInterface;
-use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\CollectionParametersInterface;
 
 /**
  * @internal

src/DataIndex/Filter/PathFilter.php

@@ -18,7 +18,7 @@
 
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\ElementParametersInterface;
-use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\CollectionParametersInterface;
 
 /**
  * @internal

src/DataIndex/OpenSearchFilter.php

@@ -23,7 +23,7 @@
 use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException;
 use Pimcore\Bundle\StudioBackendBundle\Factory\QueryFactoryInterface;
 use Pimcore\Bundle\StudioBackendBundle\Filter\Service\FilterServiceInterface;
-use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\CollectionParametersInterface;
 use Pimcore\Bundle\StudioBackendBundle\Util\Constants\ElementTypes;
 
 /**

src/DataIndex/OpenSearchFilterInterface.php

@@ -19,7 +19,7 @@
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface;
 use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidFilterTypeException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException;
-use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\CollectionParametersInterface;
 
 /**
  * @internal

src/DataIndex/Request/ElementParameters.php

@@ -16,7 +16,7 @@
 
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Request;
 
-use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParameters;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\CollectionParameters;
 
 /**
  * @internal

src/DataIndex/Request/ElementParametersInterface.php

@@ -16,7 +16,7 @@
 
 namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Request;
 
-use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\CollectionParametersInterface;
 
 /**
  * @internal