Code review changes

Author: TheSyscall

configuration.php

@@ -6,7 +6,7 @@
 /** @var \Icinga\Application\Modules\Module $this */
 
 $this->provideConfigTab('backends', array(
-    'title' => $this->translate('Configure the Chrome/WebDriver connection'),
+    'title' => $this->translate('Configure Chrome/WebDriver connections'),
     'label' => $this->translate('Backends'),
     'url'   => 'config/backends'
 ));

library/Pdfexport/Backend/Chromedriver.php

@@ -28,13 +28,7 @@ protected function setContent(PrintableHtmlDocument $document): void
         parent::setContent($document);
 
         $module = Icinga::app()->getModuleManager()->getModule('pdfexport');
-        if (! method_exists($module, 'getJsDir')) {
-            $jsPath = join(DIRECTORY_SEPARATOR, [$module->getBaseDir(), 'public', 'js']);
-        } else {
-            $jsPath = $module->getJsDir();
-        }
-
-        $activeScripts = file_get_contents($jsPath . '/activate-scripts.js');
+        $activeScripts = file_get_contents($module->getJsDir() . '/activate-scripts.js');
 
         $this->driver->execute(
             Command::executeScript($activeScripts),

library/Pdfexport/Backend/HeadlessChromeBackend.php

@@ -372,13 +372,7 @@ protected function setContent(PrintableHtmlDocument $document): void
             ]);
 
             $module = Icinga::app()->getModuleManager()->getModule('pdfexport');
-            if (! method_exists($module, 'getJsDir')) {
-                $jsPath = join(DIRECTORY_SEPARATOR, [$module->getBaseDir(), 'public', 'js']);
-            } else {
-                $jsPath = $module->getJsDir();
-            }
-
-            $waitForLayout = file_get_contents($jsPath . '/wait-for-layout.js');
+            $waitForLayout = file_get_contents($module->getJsDir() . '/wait-for-layout.js');
 
             $promisedResult = $this->communicate($page, 'Runtime.evaluate', [
                 'awaitPromise'  => true,

library/Pdfexport/ChromeDevTools/ChromeDevTools.php

@@ -17,17 +17,13 @@ public function __construct(
 
     public function execute(Command $command): mixed
     {
-        $params = [
-            'cmd' => $command->name,
-            'params' => $command->parameters,
-        ];
-
-        $customCommand = new CustomCommand(
+        return $this->driver->execute(new CustomCommand(
             'POST',
             '/session/:sessionId/goog/cdp/execute',
-            $params,
-        );
-
-        return $this->driver->execute($customCommand);
+            [
+                'cmd' => $command->name,
+                'params' => $command->parameters,
+            ],
+        ));
     }
 }

library/Pdfexport/PrintableHtmlDocument.php

@@ -525,12 +525,8 @@ function ($matches) use ($app) {
     protected function createLayoutScript(): ValidHtml
     {
         $module = Icinga::app()->getModuleManager()->getModule('pdfexport');
-        if (! method_exists($module, 'getJsDir')) {
-            $jsPath = join(DIRECTORY_SEPARATOR, [$module->getBaseDir(), 'public', 'js']);
-        } else {
-            $jsPath = $module->getJsDir();
-        }
 
+        $jsPath = $module->getJsDir();
         $layoutJS = file_get_contents($jsPath . '/layout.js') . "\n\n\n";
         $layoutJS .= file_get_contents($jsPath . '/layout-plugins/page-breaker.js') . "\n\n\n";
 

library/Pdfexport/WebDriver/ElementPresentCondition.php

@@ -21,11 +21,7 @@ public function apply(WebDriver $driver): bool
             Command::findElement($this->mechanism, $this->value),
         );
 
-        if (isset($response['ELEMENT']) || isset($response[self::WEBDRIVER_ELEMENT_IDENTIFIER])) {
-            return true;
-        }
-
-        return false;
+        return isset($response['ELEMENT']) || isset($response[self::WEBDRIVER_ELEMENT_IDENTIFIER]);
     }
 
     public static function byCssSelector(string $selector): static

public/js/activate-scripts.js

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 function activateScripts(node) {
-    if (isScript(node) === true) {
-        node.parentNode.replaceChild(cloneScript(node) , node);
+    if (node.tagName === 'SCRIPT') {
+        node.parentNode.replaceChild(cloneScript(node), node);
     } else {
         var i = -1, children = node.childNodes;
         while (++i < children.length) {
@@ -15,7 +15,7 @@ function activateScripts(node) {
 }
 
 function cloneScript(node) {
-    var script  = document.createElement("script");
+    var script  = document.createElement('script');
     script.text = node.innerHTML;
 
     var i = -1, attrs = node.attributes, attr;
@@ -25,8 +25,4 @@ function cloneScript(node) {
     return script;
 }
 
-function isScript(node) {
-    return node.tagName === 'SCRIPT';
-}
-
 activateScripts(document.documentElement);