[BUGFIX] Get translated version of content record before rendering in FE

FluidTYPO3 · Aug 5, 2023 · fc5464f · fc5464f
1 parent 9fc8102
commit fc5464f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/Classes/Controller/AbstractFluxController.php b/Classes/Controller/AbstractFluxController.php
@@ -17,6 +17,7 @@
 use FluidTYPO3\Flux\Provider\Interfaces\DataStructureProviderInterface;
 use FluidTYPO3\Flux\Provider\Interfaces\FluidProviderInterface;
 use FluidTYPO3\Flux\Service\FluxService;
+use FluidTYPO3\Flux\Service\WorkspacesAwareRecordService;
 use FluidTYPO3\Flux\Utility\ExtensionNamingUtility;
 use FluidTYPO3\Flux\Utility\RecursiveArrayUtility;
 use FluidTYPO3\Flux\ViewHelpers\FormViewHelper;
@@ -56,16 +57,19 @@ abstract class AbstractFluxController extends ActionController
     protected RenderingContextBuilder $renderingContextBuilder;
     protected RequestBuilder $requestBuilder;
     protected FluxService $configurationService;
+    protected WorkspacesAwareRecordService $recordService;
     protected ?ControllerProviderInterface $provider = null;
 
     public function __construct(
         FluxService $fluxService,
         RenderingContextBuilder $renderingContextBuilder,
-        RequestBuilder $requestBuilder
+        RequestBuilder $requestBuilder,
+        WorkspacesAwareRecordService $recordService
     ) {
         $this->configurationService = $fluxService;
         $this->renderingContextBuilder = $renderingContextBuilder;
         $this->requestBuilder = $requestBuilder;
+        $this->recordService = $recordService;
 
         /** @var Arguments $arguments */
         $arguments = GeneralUtility::makeInstance(Arguments::class);
@@ -537,7 +541,15 @@ public function getRecord(): array
                 1666538343
             );
         }
-        return $contentObject->data;
+        $record = $contentObject->data;
+        if ($record['_LOCALIZED_UID'] ?? false) {
+            $record = $this->recordService->getSingle(
+                (string) $this->getFluxTableName(),
+                '*',
+                $record['_LOCALIZED_UID']
+            ) ?? $record;
+        }
+        return $record;
     }
 
     protected function getServerRequest(): ServerRequestInterface

diff --git a/Tests/Fixtures/Classes/DummyPageController.php b/Tests/Fixtures/Classes/DummyPageController.php
@@ -14,6 +14,7 @@
 use FluidTYPO3\Flux\Provider\Interfaces\ControllerProviderInterface;
 use FluidTYPO3\Flux\Service\FluxService;
 use FluidTYPO3\Flux\Service\PageService;
+use FluidTYPO3\Flux\Service\WorkspacesAwareRecordService;
 use PHPUnit\Framework\MockObject\Generator;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
 
@@ -26,7 +27,8 @@ public function __construct()
         $fluxService = $this->createMock(FluxService::class);
         $renderingContextBuilder = $this->createMock(RenderingContextBuilder::class);
         $requestBuilder = $this->createMock(RequestBuilder::class);
-        parent::__construct($fluxService, $renderingContextBuilder, $requestBuilder);
+        $recordService = $this->createMock(WorkspacesAwareRecordService::class);
+        parent::__construct($fluxService, $renderingContextBuilder, $requestBuilder, $recordService);
     }
 
     public function setView(ViewInterface $view): void

diff --git a/Tests/Unit/Controller/AbstractFluxControllerTestCase.php b/Tests/Unit/Controller/AbstractFluxControllerTestCase.php
@@ -17,6 +17,7 @@
 use FluidTYPO3\Flux\Provider\Provider;
 use FluidTYPO3\Flux\Provider\ProviderInterface;
 use FluidTYPO3\Flux\Service\FluxService;
+use FluidTYPO3\Flux\Service\WorkspacesAwareRecordService;
 use FluidTYPO3\Flux\Tests\Fixtures\Data\Records;
 use FluidTYPO3\Flux\Tests\Unit\AbstractTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -91,6 +92,7 @@ protected function getConstructorArguments(): array
             $this->fluxService,
             $this->renderingContextBuilder,
             $this->requestBuilder,
+            $this->getMockBuilder(WorkspacesAwareRecordService::class)->disableOriginalConstructor()->getMock(),
         ];
     }
 

diff --git a/Tests/Unit/Integration/NormalizedData/DataAccessTraitTest.php b/Tests/Unit/Integration/NormalizedData/DataAccessTraitTest.php
@@ -18,6 +18,7 @@
 use FluidTYPO3\Flux\Provider\ProviderInterface;
 use FluidTYPO3\Flux\Provider\ProviderResolver;
 use FluidTYPO3\Flux\Service\FluxService;
+use FluidTYPO3\Flux\Service\WorkspacesAwareRecordService;
 use FluidTYPO3\Flux\Tests\Fixtures\Classes\DummyPageController;
 use FluidTYPO3\Flux\Tests\Unit\AbstractTestCase;
 use FluidTYPO3\Flux\Utility\ExtensionConfigurationUtility;
@@ -84,7 +85,8 @@ protected function getControllerConstructorArguments(): array
         return [
             $this->fluxService,
             $this->renderingContextBuilder,
-            $this->requestBuilder
+            $this->requestBuilder,
+            $this->getMockBuilder(WorkspacesAwareRecordService::class)->disableOriginalConstructor()->getMock(),
         ];
     }