feat!: use simplified file output

REHLTYEXT-87
remindgmbh · Jun 4, 2024 · 3e4c3b7 · 3e4c3b7
1 parent 77f26aa
commit 3e4c3b7
Show file tree

Hide file tree

Showing 22 changed files with 1,024 additions and 748 deletions.
diff --git a/Classes/DataProcessing/FilesProcessor.php b/Classes/DataProcessing/FilesProcessor.php
diff --git a/Classes/DataProcessing/FlexFormProcessor.php b/Classes/DataProcessing/FlexFormProcessor.php
@@ -5,16 +5,19 @@
 namespace Remind\Headless\DataProcessing;
 
 use FriendsOfTYPO3\Headless\DataProcessing\FilesProcessor;
+use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools;
 use TYPO3\CMS\Core\Service\FlexFormService;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
+use TYPO3\CMS\Core\Utility\Exception\MissingArrayPathException;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3\CMS\Frontend\ContentObject\DataProcessorInterface;
 
 class FlexFormProcessor implements DataProcessorInterface
 {
     protected ContentObjectRenderer $cObj;
+    protected array $processorConf;
 
     /**
      * @param ContentObjectRenderer $cObj The data of the content element or page
@@ -30,6 +33,7 @@ public function process(
         array $processedData
     ): array {
         $this->cObj = $cObj;
+        $this->processorConf = $processorConf;
 
         $flexFormTools = GeneralUtility::makeInstance(FlexFormTools::class);
         $flexFormTools->reNumberIndexesOfSectionData = true;
@@ -127,14 +131,30 @@ public function parseElement(
         }
 
         if ($type === 'file') {
+            $request = $this->getRequest();
+            /** @var \TYPO3\CMS\Core\TypoScript\FrontendTypoScript $frontendTypoScript */
+            $frontendTypoScript = $request->getAttribute('frontend.typoscript');
+            $fullTypoScript = $frontendTypoScript->getSetupArray();
+            $assetProcessingConfiguration = $fullTypoScript['lib.']['assetProcessingConfiguration.'];
+
             $fieldName = $element['config']['foreign_match_fields']['fieldname'];
+
+            try {
+                $overrule = ArrayUtility::getValueByPath($this->processorConf, ['filesConfiguration.', ...array_map(function ($value) {
+                    return $value . '.';
+                }, explode('.', $fieldName))]);
+                ArrayUtility::mergeRecursiveWithOverrule($assetProcessingConfiguration, $overrule);
+            } catch (MissingArrayPathException $e) {
+            }
+
             $filesProcessor = GeneralUtility::makeInstance(FilesProcessor::class);
             $as = 'file';
             $processorConfiguration = [
                 'as' => $as,
                 'references.' => [
                     'fieldName' => $fieldName,
                 ],
+                'processingConfiguration.' => $assetProcessingConfiguration,
             ];
             $processedData = [
                 'data' => $this->cObj->data,
@@ -173,4 +193,9 @@ private function reNumberIndexes(mixed $value): mixed
         }
         return $value;
     }
+
+    private function getRequest(): ServerRequestInterface
+    {
+        return $GLOBALS['TYPO3_REQUEST'];
+    }
 }
diff --git a/Configuration/TSConfig/Page/TCEFORM.tsconfig b/Configuration/TSConfig/Page/TCEFORM.tsconfig
@@ -7,6 +7,7 @@ TCEFORM {
     tt_content {
         assets.types {
             textmedia.config.maxitems = 1
+            textmedia.config.minitems = 1
         }
         bullets_type {
             keepItems = 0,1
@@ -21,7 +22,9 @@ TCEFORM {
         }
         image.types {
             image.config.maxitems = 1
+            image.config.minitems = 1
             textpic.config.maxitems = 1
+            textpic.config.minitems = 1
         }
         imagecols.types {
             textpic {

diff --git a/Configuration/TypoScript/Configuration/PageConfiguration.typoscript b/Configuration/TypoScript/Configuration/PageConfiguration.typoscript
@@ -0,0 +1,16 @@
+page {
+    10 {
+        fields {
+            media {
+                dataProcessing {
+                    10 {
+                        processingConfiguration < lib.assetProcessingConfiguration
+                        processingConfiguration {
+                            returnFlattenObject = 0
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Configuration/TypoScript/ContentElement/Image.typoscript b/Configuration/TypoScript/ContentElement/Image.typoscript
@@ -3,13 +3,14 @@ tt_content.image {
         content {
             fields {
                 gallery >
-                images = TEXT
-                images {
+                image = TEXT
+                image {
                     dataProcessing {
                         10 = FriendsOfTYPO3\Headless\DataProcessing\FilesProcessor
                         10 {
                             references.fieldName = image
                             as = files
+                            processingConfiguration < lib.assetProcessingConfiguration
                         }
                     }
                 }

diff --git a/Configuration/TypoScript/ContentElement/ImageGallery.typoscript b/Configuration/TypoScript/ContentElement/ImageGallery.typoscript
@@ -10,6 +10,10 @@ tt_content.image_gallery {
                         10 {
                             references.fieldName = image
                             as = files
+                            processingConfiguration < lib.assetProcessingConfiguration
+                            processingConfiguration {
+                                returnFlattenObject = 0
+                            }
                         }
                     }
                 }

diff --git a/Configuration/TypoScript/ContentElement/ImageOrient.typoscript b/Configuration/TypoScript/ContentElement/ImageOrient.typoscript
@@ -0,0 +1,19 @@
+lib.imageOrient = COA
+lib.imageOrient {
+    10 = TEXT
+    10 {
+        if {
+            value = 25
+            equals.field = imageorient
+        }
+        value = right
+    }
+    20 = TEXT
+    20 {
+        if {
+            value = 26
+            equals.field = imageorient
+        }
+        value = left
+    }
+}
diff --git a/Configuration/TypoScript/ContentElement/Items.typoscript b/Configuration/TypoScript/ContentElement/Items.typoscript
@@ -59,13 +59,17 @@ lib.items {
                     parseFunc =< lib.parseFunc_links
                 }
                 items =< lib.items 
-                images = TEXT
-                images {
+                image = TEXT
+                image {
                     dataProcessing {
                         10 = FriendsOfTYPO3\Headless\DataProcessing\FilesProcessor
                         10 {
                             references.fieldName = image
                             as = files
+                            processingConfiguration < lib.assetProcessingConfiguration
+                            processingConfiguration {
+                                returnFlattenObject = 1
+                            }
                         }
                     }
                 }

diff --git a/Configuration/TypoScript/ContentElement/MenuAbstract.typoscript b/Configuration/TypoScript/ContentElement/MenuAbstract.typoscript
@@ -0,0 +1,22 @@
+tt_content.menu_abstract {
+    fields {
+        content {
+            fields {
+                menu {
+                    dataProcessing {
+                        10 {
+                            dataProcessing {
+                                10 {
+                                    processingConfiguration < lib.assetProcessingConfiguration
+                                    processingConfiguration {
+                                        returnFlattenObject = 0
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Configuration/TypoScript/ContentElement/MenuCategorizedPages.typoscript b/Configuration/TypoScript/ContentElement/MenuCategorizedPages.typoscript
@@ -0,0 +1,22 @@
+tt_content.menu_categorized_pages {
+    fields {
+        content {
+            fields {
+                menu {
+                    dataProcessing {
+                        10 {
+                            dataProcessing {
+                                10 {
+                                    processingConfiguration < lib.assetProcessingConfiguration
+                                    processingConfiguration {
+                                        returnFlattenObject = 0
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Configuration/TypoScript/ContentElement/MenuRecentlyUpdated.typoscript b/Configuration/TypoScript/ContentElement/MenuRecentlyUpdated.typoscript
@@ -0,0 +1,22 @@
+tt_content.menu_recently_updated {
+    fields {
+        content {
+            fields {
+                menu {
+                    dataProcessing {
+                        10 {
+                            dataProcessing {
+                                10 {
+                                    processingConfiguration < lib.assetProcessingConfiguration
+                                    processingConfiguration {
+                                        returnFlattenObject = 0
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Configuration/TypoScript/ContentElement/MenuRelatedPages.typoscript b/Configuration/TypoScript/ContentElement/MenuRelatedPages.typoscript
@@ -0,0 +1,22 @@
+tt_content.menu_related_pages {
+    fields {
+        content {
+            fields {
+                menu {
+                    dataProcessing {
+                        10 {
+                            dataProcessing {
+                                10 {
+                                    processingConfiguration < lib.assetProcessingConfiguration
+                                    processingConfiguration {
+                                        returnFlattenObject = 0
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Configuration/TypoScript/ContentElement/MenuSitemap.typoscript b/Configuration/TypoScript/ContentElement/MenuSitemap.typoscript
@@ -0,0 +1,22 @@
+tt_content.menu_sitemap {
+    fields {
+        content {
+            fields {
+                menu {
+                    dataProcessing {
+                        10 {
+                            dataProcessing {
+                                10 {
+                                    processingConfiguration < lib.assetProcessingConfiguration
+                                    processingConfiguration {
+                                        returnFlattenObject = 0
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Configuration/TypoScript/ContentElement/MenuSitemapPages.typoscript b/Configuration/TypoScript/ContentElement/MenuSitemapPages.typoscript
@@ -0,0 +1,22 @@
+tt_content.menu_sitemap_pages {
+    fields {
+        content {
+            fields {
+                menu {
+                    dataProcessing {
+                        10 {
+                            dataProcessing {
+                                10 {
+                                    processingConfiguration < lib.assetProcessingConfiguration
+                                    processingConfiguration {
+                                        returnFlattenObject = 0
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Configuration/TypoScript/ContentElement/Textmedia.typoscript b/Configuration/TypoScript/ContentElement/Textmedia.typoscript
@@ -2,38 +2,21 @@ tt_content.textmedia {
     fields {
         content {
             fields {
+                gallery >
                 ratio = TEXT
                 ratio {
                     field = imagecols
                     intval = 1
                 }
-                assetPosition = COA
-                assetPosition {
-                    10 = TEXT
-                    10 {
-                        if {
-                            value = 25
-                            equals.field = imageorient
-                        }
-                        value = right
-                    }
-                    20 = TEXT
-                    20 {
-                        if {
-                            value = 26
-                            equals.field = imageorient
-                        }
-                        value = left
-                    }
-                }
-                gallery >
-                assets = TEXT
-                assets {
+                mediaPosition =< lib.imageOrient
+                media = TEXT
+                media {
                     dataProcessing {
                         10 = FriendsOfTYPO3\Headless\DataProcessing\FilesProcessor
                         10 {
                             references.fieldName = assets
                             as = files
+                            processingConfiguration < lib.assetProcessingConfiguration
                         }
                     }
                 }