Gernott · Gernott · Jul 8, 2020 · Jul 6, 2020
diff --git a/Classes/CodeGenerator/AbstractCodeGenerator.php b/Classes/CodeGenerator/AbstractCodeGenerator.php
@@ -56,4 +56,12 @@ public function __construct(StorageRepository $storageRepository = null)
             $this->storageRepository = $storageRepository;
         }
     }
+
+    /**
+     * @return StorageRepository
+     */
+    public function getStorageRepository(): StorageRepository
+    {
+        return $this->storageRepository;
+    }
 }
diff --git a/Classes/CodeGenerator/TcaCodeGenerator.php b/Classes/CodeGenerator/TcaCodeGenerator.php
@@ -28,6 +28,7 @@
  * ************************************************************* */
 
 use Exception;
+use MASK\Mask\Domain\Repository\StorageRepository;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -40,6 +41,20 @@
  */
 class TcaCodeGenerator extends AbstractCodeGenerator
 {
+    /**
+     * @var FieldHelper
+     */
+    protected $fieldHelper;
+
+    public function __construct(StorageRepository $storageRepository = null, FieldHelper $fieldHelper = null)
+    {
+        parent::__construct($storageRepository);
+        if ($fieldHelper) {
+            $this->fieldHelper = $fieldHelper;
+        } else {
+            $this->fieldHelper = GeneralUtility::makeInstance(FieldHelper::class);
+        }
+    }
 
     /**
      * Generates and sets the correct tca for all the inline fields
@@ -151,36 +166,30 @@ public function setElementsTca($tca): void
     }
 
     /**
-     * Generates and sets the tca for all the extended pages
-     *
-     * @param array $tca
+     * @param string $key
+     * @return string
      */
-    public function setPageTca($tca): void
+    public function getPageTca(string $key)
     {
-        $fieldHelper = GeneralUtility::makeInstance(FieldHelper::class);
-        $prependTabs = '--div--;Content-Fields,';
-        if ($tca) {
-            $i = 0;
-            foreach ($tca as $fieldKey => $config) {
-                // no information about which element this field is for at this point
-                $elements = $fieldHelper->getElementsWhichUseField($fieldKey, 'pages');
-                $element = $elements[0];
-
-                // check if this field is of type tab
-                $formType = $fieldHelper->getFormType($fieldKey, $element['key'], 'pages');
-                if ($formType === 'Tab') {
-                    $label = $fieldHelper->getLabel($element['key'], $fieldKey, 'pages');
-                    // if a tab is in the first position then change the name of the general tab
-                    if ($i === 0) {
-                        $prependTabs = '--div--;' . $label . ',';
-                    } else {
-                        // otherwise just add new tab
-                        $fieldArray[] = '--div--;' . $label;
-                    }
+        $prependTabs = ',--div--;Content-Fields,';
+        $tca = $this->storageRepository->load();
+        $columns = $tca['pages']['elements'][$key]['columns'] ?? [];
+        for ($i = 0; $i < count($columns); $i++) {
+            $fieldKey = $columns[$i];
+
+            // check if this field is of type tab
+            $formType = $this->fieldHelper->getFormType($fieldKey, $key, 'pages');
+            if ($formType === 'Tab') {
+                $label = $this->fieldHelper->getLabel($key, $fieldKey, 'pages');
+                // if a tab is in the first position then change the name of the general tab
+                if ($i === 0) {
+                    $prependTabs = ',--div--;' . $label . ',';
                 } else {
-                    $fieldArray[] = $fieldKey;
+                    // otherwise just add new tab
+                    $fieldArray[] = '--div--;' . $label;
                 }
-                $i++;
+            } else {
+                $fieldArray[] = $fieldKey;
             }
         }
 
@@ -189,7 +198,7 @@ public function setPageTca($tca): void
         } else {
             $pageFieldString = $prependTabs;
         }
-        ExtensionManagementUtility::addToAllTCAtypes('pages', $pageFieldString);
+        return $pageFieldString;
     }
 
     /**

diff --git a/Classes/CodeGenerator/TyposcriptCodeGenerator.php b/Classes/CodeGenerator/TyposcriptCodeGenerator.php
@@ -99,42 +99,6 @@ public function generateTsConfig($json): string
         return $content;
     }
 
-    /**
-     * Generates the typoscript for pages
-     * @param array $json
-     * @return string
-     */
-    public function generatePageTyposcript($json): string
-    {
-        $pageColumns = [];
-        $disableColumns = '';
-        $pagesContent = '';
-        if ($json['pages']['elements']) {
-            foreach ($json['pages']['elements'] as $element) {
-                // Labels for pages
-                $pagesContent .= "\n[maskBeLayout('" . $element['key'] . "')]\n";
-                // if page has backendlayout with this element-key
-                if ($element['columns']) {
-                    foreach ($element['columns'] as $index => $column) {
-                        $pagesContent .= ' TCEFORM.pages.' . $column . '.label = ' . $element['labels'][$index] . "\n";
-                    }
-                    $pagesContent .= "\n";
-                    foreach ($element['columns'] as $index => $column) {
-                        $pageColumns[] = $column;
-                        $pagesContent .= ' TCEFORM.pages.' . $column . ".disabled = 0\n";
-                    }
-                }
-                $pagesContent .= "[end]\n";
-            }
-        }
-        // disable all fields by default and only activate by condition
-        foreach ($pageColumns as $column) {
-            $disableColumns .= 'TCEFORM.pages.' . $column . ".disabled = 1\n";
-        }
-        $pagesContent = $disableColumns . "\n" . $pagesContent;
-        return $pagesContent;
-    }
-
     /**
      * Generates the typoscript for the setup field
      * @param array $configuration

diff --git a/Classes/Domain/Repository/StorageRepository.php b/Classes/Domain/Repository/StorageRepository.php
@@ -79,9 +79,13 @@ class StorageRepository
     /**
      * is called before every action
      */
-    public function __construct()
+    public function __construct(SettingsService $settingsService = null)
     {
-        $this->settingsService = GeneralUtility::makeInstance(SettingsService::class);
+        if ($settingsService) {
+            $this->settingsService = $settingsService;
+        } else {
+            $this->settingsService = GeneralUtility::makeInstance(SettingsService::class);
+        }
         $this->extSettings = $this->settingsService->get();
     }
 

diff --git a/Classes/ExpressionLanguage/MaskFunctionsProvider.php b/Classes/ExpressionLanguage/MaskFunctionsProvider.php
@@ -3,10 +3,8 @@
 
 namespace MASK\Mask\ExpressionLanguage;
 
-use Doctrine\DBAL\FetchMode;
 use Symfony\Component\ExpressionLanguage\ExpressionFunction;
 use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
-use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;

diff --git a/Classes/Form/FormDataProvider/TcaTypesShowitemMaskBeLayoutFields.php b/Classes/Form/FormDataProvider/TcaTypesShowitemMaskBeLayoutFields.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MASK\Mask\Form\FormDataProvider;
+
+use MASK\Mask\CodeGenerator\TcaCodeGenerator;
+use TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher;
+use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+class TcaTypesShowitemMaskBeLayoutFields implements FormDataProviderInterface
+{
+    public function addData(array $result)
+    {
+        $tcaCodeGenerator = GeneralUtility::makeInstance(TcaCodeGenerator::class);
+        $json = $tcaCodeGenerator->getStorageRepository()->load();
+        if ($json['pages']['elements'] ?? false) {
+            $conditionMatcher = GeneralUtility::makeInstance(ConditionMatcher::class, null, $result['vanillaUid'], $result['rootline']);
+            foreach ($json['pages']['elements'] as $element) {
+                $key = $element['key'];
+                if ($conditionMatcher->match("[maskBeLayout($key)]")) {
+                    $result['processedTca']['types'][$result['recordTypeValue']]['showitem'] .= $tcaCodeGenerator->getPageTca($key);
+                    break;
+                }
+            }
+        }
+        return $result;
+    }
+}
diff --git a/Classes/Helper/FieldHelper.php b/Classes/Helper/FieldHelper.php
@@ -129,16 +129,16 @@ public function getFormType($fieldKey, $elementKey = '', $type = 'tt_content'):
         }
 
         // load tca for field from $GLOBALS
-        $tca = $GLOBALS['TCA'][$type]['columns'][$fieldKey];
-        if (!$tca['config']) {
-            $tca = $GLOBALS['TCA'][$type]['columns']['tx_mask_' . $fieldKey];
+        $tca = $GLOBALS['TCA'][$type]['columns'][$fieldKey] ?? [];
+        if (array_key_exists('config', $tca) && !$tca['config']) {
+            $tca = $GLOBALS['TCA'][$type]['columns']['tx_mask_' . $fieldKey] ?? [];
         }
-        if (!$tca['config']) {
-            $tca = $element['tca'][$fieldKey];
+        if (array_key_exists('config', $tca) && !$tca['config']) {
+            $tca = $element['tca'][$fieldKey] ?? [];
         }
 
         // if field is in inline table or $GLOBALS["TCA"] is not yet filled, load tca from json
-        if ($tca === null || !in_array($type, ['tt_content', 'pages'])) {
+        if (!$tca || !in_array($type, ['tt_content', 'pages'])) {
             $tca = $this->storageRepository->loadField($type, $fieldKey);
             if (!$tca['config']) {
                 $tca = $this->storageRepository->loadField($type, 'tx_mask_' . $fieldKey);
@@ -152,7 +152,7 @@ public function getFormType($fieldKey, $elementKey = '', $type = 'tt_content'):
         }
 
 
-        if ($tca['options'] === 'file') {
+        if (($tca['options'] ?? '') === 'file') {
             $formType = 'File';
         }
 

diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
@@ -11,7 +11,6 @@
     // Generate TCA for Pages
     $pagesColumns = $tcaCodeGenerator->generateFieldsTca($configuration['pages']['tca']);
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('pages', $pagesColumns);
-    $tcaCodeGenerator->setPageTca($configuration['pages']['tca']);
 
     // Generate TCA for Inline-Fields
     $tcaCodeGenerator->setInlineTca($configuration);