IBX-7046: Fixed Dashboard "My Content" & "My Media" edit buttons (#2114)

* Fixed Dashboard My Content & My Media edit buttons * Used lazy-loaded VersionInfo data in PagerLocationToDataMapper
ezsystems · Jan 25, 2024 · b0db6f5 · b0db6f5
1 parent f8d3028
commit b0db6f5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/lib/Tab/Dashboard/MyContentTab.php b/src/lib/Tab/Dashboard/MyContentTab.php
@@ -32,7 +32,10 @@ public function getOrder(): int
     }
 
     /**
-     * @inheritdoc
+     * @throws \Twig\Error\Error
+     * @throws \eZ\Publish\API\Repository\Exceptions\ForbiddenException
+     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
+     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
      */
     public function renderView(array $parameters): string
     {
@@ -50,7 +53,7 @@ public function renderView(array $parameters): string
         $pager->setCurrentPage($page);
 
         return $this->twig->render('@ezdesign/ui/dashboard/tab/my_content.html.twig', [
-            'data' => $this->pagerLocationToDataMapper->map($pager),
+            'data' => $this->pagerLocationToDataMapper->map($pager, true),
         ]);
     }
 }
diff --git a/src/lib/Tab/Dashboard/MyMediaTab.php b/src/lib/Tab/Dashboard/MyMediaTab.php
@@ -32,7 +32,10 @@ public function getOrder(): int
     }
 
     /**
-     * @inheritdoc
+     * @throws \Twig\Error\Error
+     * @throws \eZ\Publish\API\Repository\Exceptions\ForbiddenException
+     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
+     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
      */
     public function renderView(array $parameters): string
     {
@@ -50,7 +53,7 @@ public function renderView(array $parameters): string
         $pager->setCurrentPage($page);
 
         return $this->twig->render('@ezdesign/ui/dashboard/tab/my_media.html.twig', [
-            'data' => $this->pagerLocationToDataMapper->map($pager),
+            'data' => $this->pagerLocationToDataMapper->map($pager, true),
         ]);
     }
 }
diff --git a/src/lib/Tab/Dashboard/PagerLocationToDataMapper.php b/src/lib/Tab/Dashboard/PagerLocationToDataMapper.php
@@ -56,8 +56,8 @@ public function map(Pagerfanta $pager, bool $doMapVersionInfoData = false): arra
 
         /** @var \eZ\Publish\API\Repository\Values\Content\Location $location */
         foreach ($pager as $location) {
-            $contentInfo = $location->contentInfo;
-            $versionInfo = $doMapVersionInfoData ? $this->contentService->loadVersionInfo($contentInfo) : null;
+            $contentInfo = $location->getContentInfo();
+            $versionInfo = $doMapVersionInfoData ? $location->getContent()->getVersionInfo() : null;
             $contentType = $location->getContentInfo()->getContentType();
 
             $data[] = [