IBX-6592: Refactored solution to base Object State on Location instea…

…d of ContentInfo
ezsystems · Nov 8, 2023 · 7e135a6 · 7e135a6
1 parent e47a001
commit 7e135a6
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 61 deletions.
diff --git a/src/bundle/Controller/ObjectStateController.php b/src/bundle/Controller/ObjectStateController.php
@@ -10,7 +10,7 @@
 
 use eZ\Publish\API\Repository\ObjectStateService;
 use eZ\Publish\API\Repository\PermissionResolver;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
+use eZ\Publish\API\Repository\Values\Content\Location;
 use eZ\Publish\API\Repository\Values\ObjectState\ObjectState;
 use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup;
 use eZ\Publish\Core\MVC\ConfigResolverInterface;
@@ -296,17 +296,10 @@ public function updateAction(Request $request, ObjectState $objectState): Respon
     }
 
     /**
-     * @param \Symfony\Component\HttpFoundation\Request $request
-     * @param \eZ\Publish\API\Repository\Values\Content\ContentInfo $contentInfo
-     * @param \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup $objectStateGroup
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     *
      * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
      */
     public function updateContentStateAction(
         Request $request,
-        ContentInfo $contentInfo,
         ObjectStateGroup $objectStateGroup,
         Location $location
     ): Response {
@@ -320,18 +313,19 @@ public function updateContentStateAction(
 
         $form = $this->formFactory->create(
             ContentObjectStateUpdateType::class,
-            new ContentObjectStateUpdateData($contentInfo, $objectStateGroup, null, $location)
+            new ContentObjectStateUpdateData($objectStateGroup, null, $location)
         );
         $form->handleRequest($request);
 
+        $contentInfo = $location->getContentInfo();
+
         if ($form->isSubmitted()) {
             $result = $this->submitHandler->handle($form, function (ContentObjectStateUpdateData $data) {
-                $contentInfo = $data->getContentInfo();
+                $location = $data->getLocation();
                 $objectStateGroup = $data->getObjectStateGroup();
                 $objectState = $data->getObjectState();
-                $location = $data->getLocation();
                 $this->objectStateService->setContentState(
-                    $contentInfo,
+                    $location->getContentInfo(),
                     $objectStateGroup,
                     $objectState,
                     $location
@@ -351,8 +345,8 @@ public function updateContentStateAction(
         }
 
         return $this->redirectToRoute('_ez_content_view', [
-            'contentId' => $contentInfo->id,
-            'locationId' => $contentInfo->mainLocationId,
+            'contentId' => $contentInfo->getId(),
+            'locationId' => $contentInfo->getMainLocationId(),
             '_fragment' => 'ez-tab-location-view-details',
         ]);
     }

diff --git a/src/bundle/Resources/config/routing.yaml b/src/bundle/Resources/config/routing.yaml
@@ -821,7 +821,7 @@ ezplatform.object_state.state.bulk_delete:
         _controller: 'EzSystems\EzPlatformAdminUiBundle\Controller\ObjectStateController::bulkDeleteAction'
 
 ezplatform.object_state.contentstate.update:
-    path: /state/contentstate/update/{contentInfoId}/group/{objectStateGroupId}/{locationId}
+    path: /state/contentstate/update/{locationId}/group/{objectStateGroupId}
     defaults:
         _controller: 'EzSystems\EzPlatformAdminUiBundle\Controller\ObjectStateController::updateContentStateAction'
 

diff --git a/src/bundle/Resources/views/themes/admin/content/tab/details.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/details.html.twig
@@ -124,13 +124,11 @@
                         {{ form_start(form_state_update[object_state.objectStateGroup.id], {
                             'method': 'POST',
                             'action': path('ezplatform.object_state.contentstate.update', {
-                                'contentInfoId': content_info.id,
                                 'objectStateGroupId': object_state.objectStateGroup.id,
                                 'locationId': location.id,
                             }),
                             'attr': {'class': 'form-inline ez-form-inline ez-form-inline--align-left'}
                         }) }}
-                            {{ form_row(form_state_update[object_state.objectStateGroup.id].contentInfo) }}
                             {{ form_row(form_state_update[object_state.objectStateGroup.id].objectStateGroup) }}
                             {{ form_row(form_state_update[object_state.objectStateGroup.id].objectState, { 'attr': {'class': 'ez-form-autosubmit'} }) }}
                             {% do form_state_update[object_state.objectStateGroup.id].set.setRendered %}

diff --git a/src/lib/Form/Data/ObjectState/ContentObjectStateUpdateData.php b/src/lib/Form/Data/ObjectState/ContentObjectStateUpdateData.php
@@ -8,16 +8,12 @@
 
 namespace EzSystems\EzPlatformAdminUi\Form\Data\ObjectState;
 
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
 use eZ\Publish\API\Repository\Values\Content\Location;
 use eZ\Publish\API\Repository\Values\ObjectState\ObjectState;
 use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup;
 
 class ContentObjectStateUpdateData
 {
-    /** @var \eZ\Publish\API\Repository\Values\Content\ContentInfo|null */
-    private $contentInfo;
-
     /** @var \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup|null */
     private $objectStateGroup;
 
@@ -28,27 +24,15 @@ class ContentObjectStateUpdateData
     private $location;
 
     public function __construct(
-        ContentInfo $contentInfo = null,
         ObjectStateGroup $objectStateGroup = null,
         ObjectState $objectState = null,
         Location $location = null
     ) {
-        $this->contentInfo = $contentInfo;
         $this->objectStateGroup = $objectStateGroup;
         $this->objectState = $objectState;
         $this->location = $location;
     }
 
-    public function getContentInfo(): ContentInfo
-    {
-        return $this->contentInfo;
-    }
-
-    public function setContentInfo(ContentInfo $contentInfo)
-    {
-        $this->contentInfo = $contentInfo;
-    }
-
     public function getObjectStateGroup(): ObjectStateGroup
     {
         return $this->objectStateGroup;

diff --git a/src/lib/Form/Type/ObjectState/ContentObjectStateUpdateType.php b/src/lib/Form/Type/ObjectState/ContentObjectStateUpdateType.php
@@ -12,7 +12,7 @@
 use eZ\Publish\API\Repository\PermissionResolver;
 use eZ\Publish\API\Repository\Values\ObjectState\ObjectState;
 use EzSystems\EzPlatformAdminUi\Form\Data\ObjectState\ContentObjectStateUpdateData;
-use EzSystems\EzPlatformAdminUi\Form\Type\Content\ContentInfoType;
+use EzSystems\EzPlatformAdminUi\Form\Type\Content\LocationType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -29,23 +29,16 @@ class ContentObjectStateUpdateType extends AbstractType
     /** @var \eZ\Publish\API\Repository\PermissionResolver */
     private $permissionResolver;
 
-    /**
-     * @param \eZ\Publish\API\Repository\ObjectStateService $objectStateService
-     * @param \eZ\Publish\API\Repository\PermissionResolver $permissionResolver
-     */
     public function __construct(ObjectStateService $objectStateService, PermissionResolver $permissionResolver)
     {
         $this->objectStateService = $objectStateService;
         $this->permissionResolver = $permissionResolver;
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
-            ->add('contentInfo', ContentInfoType::class, [
+            ->add('location', LocationType::class, [
                 'label' => false,
             ])
             ->add('objectStateGroup', ObjectStateGroupType::class, [
@@ -59,21 +52,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             /** @var \EzSystems\EzPlatformAdminUi\Form\Data\ObjectState\ContentObjectStateUpdateData $contentObjectStateUpdateData */
             $contentObjectStateUpdateData = $event->getData();
             $objectStateGroup = $contentObjectStateUpdateData->getObjectStateGroup();
-            $contentInfo = $contentObjectStateUpdateData->getContentInfo();
             $location = $contentObjectStateUpdateData->getLocation();
             $form = $event->getForm();
 
             $form->add('objectState', ObjectStateChoiceType::class, [
                 'label' => false,
                 'choice_loader' => new CallbackChoiceLoader(
-                    function () use ($objectStateGroup, $contentInfo, $location) {
+                    function () use ($objectStateGroup, $location) {
                         return array_filter(
                             $this->objectStateService->loadObjectStates($objectStateGroup),
-                            function (ObjectState $objectState) use ($contentInfo, $location) {
+                            function (ObjectState $objectState) use ($location) {
                                 return $this->permissionResolver->canUser(
                                     'state',
                                     'assign',
-                                    $contentInfo,
+                                    $location->getContentInfo(),
                                     [$location, $objectState],
                                 );
                             }
@@ -83,10 +75,7 @@ function (ObjectState $objectState) use ($contentInfo, $location) {
         });
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => ContentObjectStateUpdateData::class,

diff --git a/src/lib/Tab/LocationView/DetailsTab.php b/src/lib/Tab/LocationView/DetailsTab.php
@@ -116,6 +116,8 @@ public function getTemplate(): string
 
     /**
      * @inheritdoc
+     *
+     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
      */
     public function getTemplateParameters(array $contextParameters = []): array
     {
@@ -133,7 +135,7 @@ public function getTemplateParameters(array $contextParameters = []): array
         ]);
 
         $this->supplySectionParameters($viewParameters, $contentInfo, $location);
-        $this->supplyObjectStateParameters($viewParameters, $contentInfo, $location);
+        $this->supplyObjectStateParameters($viewParameters, $location);
         $this->supplyTranslations($viewParameters, $versionInfo);
         $this->supplyFormLocationUpdate($viewParameters, $location);
         $this->supplyCreator($viewParameters, $contentInfo);
@@ -185,13 +187,15 @@ private function supplyLastContributor(ArrayObject $parameters, VersionInfo $ver
         }
     }
 
+    /**
+     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
+     */
     private function supplyObjectStateParameters(
         ArrayObject &$parameters,
-        ContentInfo $contentInfo,
         Location $location
     ): void {
         $objectStatesDataset = $this->datasetFactory->objectStates();
-        $objectStatesDataset->load($contentInfo, $location);
+        $objectStatesDataset->load($location);
 
         $canAssignObjectState = $this->canUserAssignObjectState();
 
@@ -205,7 +209,6 @@ private function supplyObjectStateParameters(
                 $objectStateUpdateForm = $this->formFactory->create(
                     ContentObjectStateUpdateType::class,
                     new ContentObjectStateUpdateData(
-                        $contentInfo,
                         $objectStateGroup,
                         $objectState,
                         $location,

diff --git a/src/lib/UI/Dataset/ObjectStatesDataset.php b/src/lib/UI/Dataset/ObjectStatesDataset.php
@@ -9,7 +9,6 @@
 namespace EzSystems\EzPlatformAdminUi\UI\Dataset;
 
 use eZ\Publish\API\Repository\ObjectStateService;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
 use eZ\Publish\API\Repository\Values\Content\Location;
 use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup;
 use EzSystems\EzPlatformAdminUi\UI\Value as UIValue;
@@ -32,16 +31,16 @@ public function __construct(ObjectStateService $objectStateService, ValueFactory
         $this->valueFactory = $valueFactory;
     }
 
-    public function load(ContentInfo $contentInfo, Location $location): self
+    public function load(Location $location): self
     {
         $data = array_map(
-            function (ObjectStateGroup $objectStateGroup) use ($contentInfo, $location) {
+            function (ObjectStateGroup $objectStateGroup) use ($location) {
                 $hasObjectStates = !empty($this->objectStateService->loadObjectStates($objectStateGroup));
                 if (!$hasObjectStates) {
                     return [];
                 }
 
-                return $this->valueFactory->createObjectState($contentInfo, $objectStateGroup, $location);
+                return $this->valueFactory->createObjectState($objectStateGroup, $location);
             },
             $this->objectStateService->loadObjectStateGroups()
         );

diff --git a/src/lib/UI/Value/ValueFactory.php b/src/lib/UI/Value/ValueFactory.php
@@ -16,7 +16,6 @@
 use eZ\Publish\API\Repository\SearchService;
 use eZ\Publish\API\Repository\UserService;
 use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
 use eZ\Publish\API\Repository\Values\Content\DraftList\Item\ContentDraftListItem;
 use eZ\Publish\API\Repository\Values\Content\DraftList\Item\UnauthorizedContentDraftListItem;
 use eZ\Publish\API\Repository\Values\Content\Language;
@@ -257,10 +256,10 @@ public function createLocation(Location $location): UIValue\Content\Location
      * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
      */
     public function createObjectState(
-        ContentInfo $contentInfo,
         ObjectStateGroup $objectStateGroup,
         Location $location
     ): UIValue\ObjectState\ObjectState {
+        $contentInfo = $location->getContentInfo();
         $objectState = $this->objectStateService->getContentState($contentInfo, $objectStateGroup);
 
         return new UIValue\ObjectState\ObjectState($objectState, [