Merge branch '2026.1' into 2026.x

Author: lukmzig

src/Workflow/Controller/ElementsController.php

@@ -15,6 +15,7 @@
 
 use OpenApi\Attributes\Get;
 use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attribute\Parameter\Path\ElementTypeParameter;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attribute\Parameter\Query\PageParameter;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attribute\Parameter\Query\PageSizeParameter;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attribute\Parameter\Query\StringParameter;
@@ -41,7 +42,7 @@ final class ElementsController extends AbstractApiController
 {
     use PaginatedResponseTrait;
 
-    private const string ROUTE = '/workflows/elements';
+    private const string ROUTE = '/workflows/elements/{elementType}';
 
     public function __construct(
         SerializerInterface $serializer,
@@ -63,9 +64,9 @@ public function __construct(
         summary: 'workflow_get_elements_summary',
         tags: [Tags::Workflows->name]
     )]
+    #[ElementTypeParameter]
     #[StringParameter('workflowName', 'product_workflow', 'Workflow name')]
     #[StringParameter('stateName', 'in_review', 'Workflow state / place name', required: false)]
-    #[StringParameter('elementType', 'asset', 'Element type (asset or data-object)', required: false)]
     #[PageParameter]
     #[PageSizeParameter(50)]
     #[SuccessResponse(
@@ -74,12 +75,14 @@ public function __construct(
     )]
     #[DefaultResponses([
         HttpResponseCodes::UNAUTHORIZED,
+        HttpResponseCodes::FORBIDDEN,
         HttpResponseCodes::INTERNAL_SERVER_ERROR,
     ])]
     public function getElements(
+        string $elementType,
         #[MapQueryString] WorkflowElementsParameters $parameters = new WorkflowElementsParameters()
     ): JsonResponse {
-        $collection = $this->workflowElementsService->getElements($parameters);
+        $collection = $this->workflowElementsService->getElements($parameters, $elementType);
 
         return $this->getPaginatedCollection(
             $this->serializer,

src/Workflow/MappedParameter/WorkflowElementsParameters.php

@@ -23,7 +23,6 @@
     public function __construct(
         private string $workflowName = '',
         private ?string $stateName = null,
-        private ?string $elementType = null,
         private int $page = 1,
         private int $pageSize = 50,
     ) {
@@ -39,11 +38,6 @@ public function getStateName(): ?string
         return $this->stateName;
     }
 
-    public function getElementType(): ?string
-    {
-        return $this->elementType;
-    }
-
     public function getPage(): int
     {
         return max(1, $this->page);

src/Workflow/Service/WorkflowElementsService.php

@@ -45,7 +45,7 @@ public function __construct(
     ) {
     }
 
-    public function getElements(WorkflowElementsParameters $parameters): Collection
+    public function getElements(WorkflowElementsParameters $parameters, string $elementType): Collection
     {
         $workflowName = $parameters->getWorkflowName();
         if ($workflowName === '') {
@@ -61,7 +61,7 @@ public function getElements(WorkflowElementsParameters $parameters): Collection
         $rows = $this->elementsRepository->fetchByWorkflowState(
             $workflowName,
             $stateName,
-            $parameters->getElementType(),
+            $elementType,
         );
 
         [$stateLabel, $stateColor] = $stateName !== null && $stateName !== ''

src/Workflow/Service/WorkflowElementsServiceInterface.php

@@ -29,5 +29,5 @@ interface WorkflowElementsServiceInterface
      *
      * @return Collection<WorkflowElement>
      */
-    public function getElements(WorkflowElementsParameters $parameters): Collection;
+    public function getElements(WorkflowElementsParameters $parameters, string $elementType): Collection;
 }