[TASK] TYPO3 11 LTS Compatibility

christophlehmann · Oct 6, 2021 · 8ff9326 · 8ff9326
1 parent be12bb5
commit 8ff9326
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 75 deletions.
diff --git a/Classes/Controller/FilterController.php b/Classes/Controller/FilterController.php
@@ -17,7 +17,7 @@ public function fetchFilterAction(ServerRequestInterface $request): ResponseInte
             /** @var NewContentElementController $controller */
             $controller = GeneralUtility::makeInstance(NewContentElementController::class);
             /** @var HtmlResponse $htmlResponse */
-            $htmlResponse = $controller->wizardAction($request);
+            $htmlResponse = $controller->handleRequest($request);
 
             return $htmlResponse;
         }

diff --git a/Classes/Controller/NewContentElementController.php b/Classes/Controller/NewContentElementController.php
@@ -4,26 +4,23 @@
 namespace Lemming\PageTreeFilter\Controller;
 
 use Lemming\PageTreeFilter\Utility\ConfigurationUtility;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 
 class NewContentElementController extends \TYPO3\CMS\Backend\Controller\ContentElement\NewContentElementController
 {
-    protected function init(ServerRequestInterface $request)
+    public function handleRequest(ServerRequestInterface $request): ResponseInterface
     {
         $queryParameters = $request->getQueryParams();
         $queryParameters['id'] = ConfigurationUtility::getPageId();
         $requestWithPageId = $request->withQueryParams($queryParameters);
-        parent::init($requestWithPageId);
 
-        $this->menuItemView->assignMultiple([
-            'isVersion10' => version_compare(VersionNumberUtility::getNumericTypo3Version(), '11', '<')
-        ]);
+        return parent::handleRequest($requestWithPageId);
     }
 
     public function getWizards(): array
@@ -49,7 +46,6 @@ protected function appendPageTypes(array $wizards): array
                 $wizards['pagetypes_' . $no] = [
                     'title' => $this->getLanguageService()->sL($pageTypeConfiguration[0]),
                     'iconIdentifier' => $GLOBALS['TCA']['pages']['ctrl']['typeicon_classes'][$pageTypeConfiguration[1]],
-                    'params' => '', // if missing it leads to an exception
                     'filter' => sprintf('table=pages doktype=%d', $pageTypeConfiguration[1]),
                     'disabled' => !in_array($pageTypeConfiguration[1], $usedPageTypes)
                 ];
@@ -82,7 +78,6 @@ protected function appendRecords(array $wizards): array
                 $wizards['records_' . $tableName] = [
                     'title' => $this->getLanguageService()->sL($tableConfiguration['ctrl']['title']),
                     'iconIdentifier' => $iconIdentifier,
-                    'params' => '', // if missing it leads to an exception
                     'filter' => sprintf('table=%s', $tableName),
                     'disabled' => $this->areRecordsInTable($tableName) ? false : true
                 ];
@@ -161,12 +156,11 @@ protected function areRecordsInTable($tableName): bool
         return $oneRecord !== false;
     }
 
-    protected function getFluidTemplateObject(string $filename = 'Main.html'): StandaloneView
+    protected function getFluidTemplateObject(string $templateName): StandaloneView
     {
         /** @var StandaloneView $view */
         $view = GeneralUtility::makeInstance(StandaloneView::class);
-        $view->setTemplatePathAndFilename(GeneralUtility::getFileAbsFileName('EXT:pagetreefilter/Resources/Private/Templates/Filter/' . $filename));
-        $view->getRequest()->setControllerExtensionName('Pagetreefilter');
+        $view->setTemplatePathAndFilename(GeneralUtility::getFileAbsFileName('EXT:pagetreefilter/Resources/Private/Templates/Filter/' . $templateName . '.html'));
 
         return $view;
     }

diff --git a/Resources/Private/Templates/Filter/Main.html b/Resources/Private/Templates/Filter/Main.html
diff --git a/Resources/Private/Templates/Filter/MenuItem.html b/Resources/Private/Templates/Filter/MenuItem.html
@@ -1,26 +1,25 @@
-<html
-    xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
-    xmlns:pagetreefilter="http://typo3.org/ns/Lemming/PageTreeFilter/ViewHelpers"
-    data-namespace-typo3-fluid="true">
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true"
+      xmlns:pagetreefilter="http://typo3.org/ns/Lemming/PageTreeFilter/ViewHelpers">
 
-<div class="{f:if(condition: '{isVersion10}', then: 'media')} t3js-media-new-content-element-wizard media-new-content-element-wizard">
-    <a href="#" class="pagetreefilter{f:if(condition: '{isVersion10}', else: ' media')}{f:if(condition: '{wizardInformation.disabled}', then: ' disabled')}"
-        data-pagetreefilter="{f:if(condition: '{wizardInformation.filter}', then: '{wizardInformation.filter}', else: '{pagetreefilter:buildFilter(wizardInformation: \'{wizardInformation}\')}')}"
-        data-bs-slide="next">
-
-        <f:if condition="{content}">
-            {content -> f:format.raw()}
-        </f:if>
-        <div class="media-left">
-            {icon -> f:format.raw()}
-        </div>
-        <div class="media-body">
-
-            <strong>{wizardInformation.title -> f:format.htmlspecialchars()}</strong>
-            <br/>
-            {wizardInformation.description -> f:format.nl2br() -> f:format.htmlspecialchars()}
-        </div>
+<div class="t3js-media-new-content-element-wizard media-new-content-element-wizard">
+    <a class="pagetreefilter btn btn-link media p-0 text-start {f:if(condition: '{wizardInformation.disabled}', then: ' disabled')}"
+       data-pagetreefilter="{f:if(condition: '{wizardInformation.filter}', then: '{wizardInformation.filter}', else: '{pagetreefilter:buildFilter(wizardInformation: \'{wizardInformation}\')}')}">
+        <f:render section="itemContent" arguments="{_all}" />
     </a>
 </div>
 
-</html>
+<f:section name="itemContent">
+    <f:if condition="{content}">
+        {content -> f:format.raw()}
+    </f:if>
+    <div class="media-left">
+        {icon -> f:format.raw()}
+    </div>
+    <div class="media-body">
+        <strong>{wizardInformation.title -> f:format.htmlspecialchars()}</strong>
+        <br/>
+        {wizardInformation.description -> f:format.nl2br() -> f:format.htmlspecialchars()}
+    </div>
+</f:section>
+
+</html>
diff --git a/Resources/Private/Templates/Filter/Wizard.html b/Resources/Private/Templates/Filter/Wizard.html
@@ -0,0 +1,17 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+
+<f:if condition="{hasAccess}">
+    <f:then>
+        <div class="t3-new-content-element-wizard-window">
+            <div class="container mt-2">
+                <f:translate key="wizard_description"/>
+            </div>
+            <div class="t3-new-content-element-wizard-inner">
+                {renderedTabs -> f:format.raw()}
+            </div>
+        </div>
+    </f:then>
+    <f:else>
+        <p><f:translate key="wizard_error_message"/></p>
+    </f:else>
+</f:if>
diff --git a/Resources/Public/Css/Backend/pagetreefilter.css b/Resources/Public/Css/Backend/pagetreefilter.css
@@ -8,4 +8,9 @@
 .pagetreefilter-highlighted.node-over,
 .pagetreefilter-highlighted.node-selected {
     fill-opacity: 0.3;
+}
+
+.pagetreefilter-wizard .modal-body {
+    background-color: #fafafa;
+    padding: 0;
 }
diff --git a/Resources/Public/JavaScript/PageTreeFilter.js b/Resources/Public/JavaScript/PageTreeFilter.js
@@ -31,35 +31,28 @@ require([], function () {
             );
         }
 
-        document.querySelector('#pagetreefilter').onclick = function() { showSubMenu(); openWizard(); }
-    }
-
-    // TYPO3 10
-    function showSubMenu()
-    {
-        defaultFilterButton = document.querySelector('.svg-toolbar__menu div[data-tree-show-submenu="filter"]');
-        if (defaultFilterButton !== null) {
-            defaultFilterButton.click();
-        }
+        document.querySelector('#pagetreefilter').onclick = function() { openWizard(); }
     }
 
     function openWizard()
     {
-        TYPO3.Modal.loadUrl(
-            TYPO3.lang.pagetreefilter_wizard_title,
-            TYPO3.Severity.info,
-            [],
-            TYPO3.settings.ajaxUrls.pagetreefilter_fetch_filter,
-            function () {
+        TYPO3.Modal.advanced({
+            size: 'medium',
+            type: 'ajax',
+            title: TYPO3.lang.pagetreefilter_wizard_title,
+            severity: TYPO3.Severity.info,
+            ajaxCallback: function () {
                 let links = document.querySelectorAll('a.pagetreefilter');
                 links.forEach((button) => {
                     button.addEventListener('click', () => {
                         applyFilter(button.getAttribute('data-pagetreefilter'));
                         TYPO3.Modal.dismiss()
                     });
                 });
-            }
-        )
+            },
+            content: TYPO3.settings.ajaxUrls.pagetreefilter_fetch_filter,
+            additionalCssClasses: ['pagetreefilter-wizard']
+        });
     }
 
     function applyFilter(filter)

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "typo3/cms-backend": "^10.4 || ^11"
+        "typo3/cms-backend": "^11.5"
     },
     "autoload": {
         "psr-4": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -4,15 +4,15 @@
     'title' => 'Pagetree Filter',
     'description' => 'Filter the pagetree for records and content elements. For simplicity it comes with a wizard.',
     'category' => 'be',
-    'state' => 'beta',
+    'state' => 'stable',
     'clearCacheOnLoad' => 1,
     'author' => 'Christoph Lehmann',
     'author_email' => '[email protected]',
     'author_company' => '',
-    'version' => '0.1.0',
+    'version' => '1.0.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '10.4.0-11.4.99'
+            'typo3' => '11.5.0-11.5.99'
         ],
         'conflicts' => [],
         'suggests' => [],