[FEATURE] Add support for PAGEVIEW data processing

Author: nhovratov

Build/content-blocks-examples/Configuration/Sets/Example/setup.typoscript

@@ -4,5 +4,6 @@ page.10 {
   paths.10 = EXT:content_blocks_examples/Resources/Private/Templates
   dataProcessing {
     10 = page-content
+    20 = content-blocks
   }
 }

Classes/DataProcessing/ContentBlockDataDecorator.php

@@ -51,13 +51,16 @@ public function setRequest(ServerRequestInterface $request): void
 
     public function decorate(RecordInterface $resolvedRecord, ?PageLayoutContext $context = null): ContentBlockData
     {
-        $tableDefinition = $this->tableDefinitionCollection->getTable($resolvedRecord->getMainType());
         $contentTypeDefinition = $this->contentTypeResolver->resolve($resolvedRecord);
-        $identifier = $this->getRecordIdentifier($resolvedRecord);
-        $this->contentBlockDataDecoratorSession->addContentBlockData($identifier, new ContentBlockData());
         $resolvedContentBlockDataRelation = new ResolvedContentBlockDataRelation();
         $resolvedContentBlockDataRelation->record = $resolvedRecord;
         $resolvedContentBlockDataRelation->resolved = $resolvedRecord->toArray();
+        if ($contentTypeDefinition === null) {
+            return $this->buildFakeContentBlockDataObject($resolvedContentBlockDataRelation);
+        }
+        $identifier = $this->getRecordIdentifier($resolvedRecord);
+        $this->contentBlockDataDecoratorSession->addContentBlockData($identifier, new ContentBlockData());
+        $tableDefinition = $this->tableDefinitionCollection->getTable($resolvedRecord->getMainType());
         $contentBlockData = $this->buildContentBlockDataObjectRecursive(
             $contentTypeDefinition,
             $tableDefinition,
@@ -299,11 +302,9 @@ private function buildFakeContentBlockDataObject(ResolvedContentBlockDataRelatio
     private function getRecordIdentifier(RecordInterface $record): string
     {
         $identifier = $record->getMainType();
-
         if ($record instanceof Record) {
             $identifier .= '-' . $record->getOverlaidUid();
         }
-
         return $identifier;
     }
 }

Classes/DataProcessing/ContentBlocksDataProcessor.php

@@ -45,19 +45,14 @@ public function process(
         $request = $cObj->getRequest();
         $this->contentBlockDataDecorator->setRequest($request);
         $table = $cObj->getCurrentTable();
-        if (!$this->tableDefinitionCollection->hasTable($table)) {
+        // Fall back to ContentObjectRenderer->data if the key "data" is not populated.
+        // This is the case, for example, for PAGEVIEW.
+        $data = $processedData['data'] ?? $cObj->data;
+        if ($data === []) {
             return $processedData;
         }
-        $resolveRecord = $this->recordFactory->createResolvedRecordFromDatabaseRow(
-            $table,
-            $processedData['data'],
-        );
-        $contentTypeDefinition = $this->contentTypeResolver->resolve($resolveRecord);
-        if ($contentTypeDefinition === null) {
-            $processedData['data'] = $resolveRecord;
-            return $processedData;
-        }
-        $processedData['data'] = $this->contentBlockDataDecorator->decorate($resolveRecord);
+        $resolvedRecord = $this->recordFactory->createResolvedRecordFromDatabaseRow($table, $data);
+        $processedData['data'] = $this->contentBlockDataDecorator->decorate($resolvedRecord);
         return $processedData;
     }
 }

Classes/DataProcessing/ContentTypeResolver.php

@@ -32,7 +32,11 @@ public function __construct(
 
     public function resolve(RecordInterface $record): ?ContentTypeInterface
     {
-        $tableDefinition = $this->tableDefinitionCollection->getTable($record->getMainType());
+        $table = $record->getMainType();
+        if (!$this->tableDefinitionCollection->hasTable($table)) {
+            return null;
+        }
+        $tableDefinition = $this->tableDefinitionCollection->getTable($table);
         $typeName = $tableDefinition->hasTypeField()
             ? $record->getRecordType()
             : '1';

Tests/Fixtures/Extensions/test_content_blocks_b/ContentBlocks/ContentElements/content-element-b/templates/frontend.html

@@ -1,6 +1,5 @@
 <html
     xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
-    xmlns:cb="http://typo3.org/ns/TYPO3/CMS/ContentBlocks/ViewHelpers"
     data-namespace-typo3-fluid="true"
 >
 

Tests/Fixtures/Extensions/test_content_blocks_b/ContentBlocks/PageTypes/example/assets/icon-hide-in-menu.svg

@@ -0,0 +1,6 @@
+name: example/example-page-type
+typeName: 942
+prefixFields: false
+fields:
+  - identifier: additional_field
+    type: Text

Tests/Fixtures/Extensions/test_content_blocks_b/ContentBlocks/PageTypes/example/assets/icon-root.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-09-20T23:35:32+00:00" product-name="example/example-page-type">
+		<header/>
+		<body>
+			<trans-unit id="title">
+				<source>My custom page type</source>
+			</trans-unit>
+			<trans-unit id="description">
+				<source>This is your page type description</source>
+			</trans-unit>
+			<trans-unit id="additional_field.label">
+				<source>Additional field</source>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>