[BUGFIX] Fix collapse script integration (FluidTYPO3#1829)

Fixes the inclusion of the content area collaps script, and improves the integration by avoiding the creation of a ModuleTemplate which internally creates a view, by replacing it with simple asset inclusions which was the only feature from ModuleTemplate that was needed. Close: FluidTYPO3#1820
dextar47 · Sep 12, 2020 · 16d8f9b · 16d8f9b
1 parent b7955ac
commit 16d8f9b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 36 deletions.
diff --git a/Classes/Integration/HookSubscribers/ContentIcon.php b/Classes/Integration/HookSubscribers/ContentIcon.php
@@ -95,8 +95,6 @@ public function addSubIcon(array $parameters, $caller = null)
             return '';
         }
 
-        $this->attachAssets();
-
         $provider = null;
         $icon = '';
         $record = null === $record && 0 < $uid ? BackendUtility::getRecord($table, $uid) : $record;
@@ -203,12 +201,4 @@ protected function detectFirstFlexTypeFieldInTableFromPossibilities($table, $fie
         }
         return null;
     }
-
-    /**
-     * @return void
-     */
-    protected function attachAssets()
-    {
-        $GLOBALS['TBE_STYLES']['stylesheet'] = 'EXT:flux/Resources/Public/css/flux.css';
-    }
 }
diff --git a/Classes/Integration/HookSubscribers/Preview.php b/Classes/Integration/HookSubscribers/Preview.php
@@ -11,13 +11,10 @@
 
 use FluidTYPO3\Flux\Provider\ProviderInterface;
 use FluidTYPO3\Flux\Service\FluxService;
-use TYPO3\CMS\Backend\Template\ModuleTemplate;
 use TYPO3\CMS\Backend\View\PageLayoutView;
 use TYPO3\CMS\Backend\View\PageLayoutViewDrawItemHookInterface;
-use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 
 /**
@@ -69,24 +66,9 @@ public function preProcess(PageLayoutView &$parentObject, &$drawItem, &$headerCo
     protected function attachAssets()
     {
         if (false === static::$assetsIncluded) {
-            $doc = GeneralUtility::makeInstance(ModuleTemplate::class);
-            $doc->backPath = $GLOBALS['BACK_PATH'] ?? '';
-
-            /** @var PageRenderer $pageRenderer */
-            $pageRenderer = $doc->getPageRenderer();
-
-            $fullJsPath = PathUtility::getRelativePath(
-                defined('PATH_typo3') ? PATH_typo3 : Environment::getPublicPath(),
-                GeneralUtility::getFileAbsFileName('EXT:flux/Resources/Public/js/')
-            );
-
-            // requirejs
-            $pageRenderer->addRequireJsConfiguration([
-                'paths' => [
-                    'FluidTypo3/Flux/FluxCollapse' => $fullJsPath . 'fluxCollapse',
-                ],
-            ]);
-            $pageRenderer->loadRequireJsModule('FluidTypo3/Flux/FluxCollapse');
+            $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+            $pageRenderer->addCssFile('EXT:flux/Resources/Public/css/flux.css');
+            $pageRenderer->loadRequireJsModule('TYPO3/CMS/Flux/FluxCollapse');
 
             static::$assetsIncluded = true;
         }

diff --git a/Resources/Public/js/fluxCollapse.js → Resources/Public/JavaScript/FluxCollapse.js b/Resources/Public/js/fluxCollapse.js → Resources/Public/JavaScript/FluxCollapse.js
diff --git a/Tests/Unit/Integration/HookSubscribers/PreviewTest.php b/Tests/Unit/Integration/HookSubscribers/PreviewTest.php
@@ -63,13 +63,12 @@ protected function callUserFunction($function, $caller)
      */
     public function testAttachAssets()
     {
-        $pageRenderer = $this->getMockBuilder(PageRenderer::class)->setMethods(['addRequireJsConfiguration', 'loadRequireJsModule'])->getMock();
-        $pageRenderer->expects($this->atLeastOnce())->method('addRequireJsConfiguration');
+        $pageRenderer = $this->getMockBuilder(PageRenderer::class)->setMethods(['loadRequireJsModule'])->getMock();
         $pageRenderer->expects($this->atLeastOnce())->method('loadRequireJsModule');
-        $document = $this->getMockBuilder(ModuleTemplate::class)->setMethods(['getPageRenderer'])->getMock();
-        $document->expects($this->once())->method('getPageRenderer')->willReturn($pageRenderer);
-        GeneralUtility::addInstance(ModuleTemplate::class, $document);
+        $instances = GeneralUtility::getSingletonInstances();
+        GeneralUtility::setSingletonInstance(PageRenderer::class, $pageRenderer);
         $subject = $this->createInstance();
         $this->callInaccessibleMethod($subject, 'attachAssets');
+        GeneralUtility::resetSingletonInstances($instances);
     }
 }