11052-speed-optimization-extension

Author: Yuriy

Model/Config/Backend/DevSettings.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magefan ([email protected]). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ *
+ * Glory to Ukraine! Glory to the heroes!
+ */
+
+declare(strict_types=1);
+
+namespace Magefan\RocketJavaScript\Model\Config\Backend;
+
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Data\Collection\AbstractDb;
+
+class DevSettings extends Value
+{
+    const KEY_VALUE_RELATION = [
+        'mfrocketjavascript/general/merge_files' => 'dev/js/merge_files',
+        'mfrocketjavascript/general/minify_files' => 'dev/js/minify_files',
+        'mfrocketjavascript/javascript_bundling/enabled' => 'dev/js/enable_js_bundling',
+    ];
+
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * DevSettings constructor.
+     * @param Context $context
+     * @param Registry $registry
+     * @param ScopeConfigInterface $config
+     * @param TypeListInterface $cacheTypeList
+     * @param RequestInterface $request
+     * @param AbstractResource|null $resource
+     * @param AbstractDb|null $resourceCollection
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        Registry $registry,
+        ScopeConfigInterface $config,
+        TypeListInterface $cacheTypeList,
+        RequestInterface $request,
+        AbstractResource $resource = null,
+        AbstractDb $resourceCollection = null,
+        array $data = []
+    ) {
+        $this->request = $request;
+        parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
+    }
+
+    /**
+     * @return DevSettings|void
+     */
+    public function afterLoad()
+    {
+        $scopeTypes = [
+            StoreScopeInterface::SCOPE_WEBSITES,
+            StoreScopeInterface::SCOPE_WEBSITE,
+            StoreScopeInterface::SCOPE_STORES,
+            StoreScopeInterface::SCOPE_STORE
+        ];
+
+        $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
+        $scopeCode = null;
+
+        foreach ($scopeTypes as $scope) {
+            $param = $this->request->getParam($scope);
+            if ($param) {
+                $scopeType = $scope;
+                $scopeCode = $param;
+            }
+        }
+
+        $devSettingsValue = $this->_config->getValue(
+            self::KEY_VALUE_RELATION[$this->getData('path')],
+            $scopeType,
+            $scopeCode
+        );
+        $this->setData('value', $devSettingsValue);
+    }
+}

Model/Controller/ResultPlugin.php

@@ -81,7 +81,7 @@ public function aroundRenderResult(
         }
 
         $ignoredStrings = $this->scopeConfig->getValue(
-            'mfrocketjavascript/general/ignore_deferred_javascript_with',
+            'mfrocketjavascript/deferred_javascript/ignore_deferred_javascript_with',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE) ?: '';
         $ignoredStrings = explode("\n", str_replace("\r", "\n", $ignoredStrings));
         foreach ($ignoredStrings as $key => $ignoredString) {
@@ -150,11 +150,11 @@ private function isEnabled()
             'mfrocketjavascript/general/enabled',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) && $this->scopeConfig->getValue(
-            'mfrocketjavascript/general/enable_deferred_javascript',
+            'mfrocketjavascript/deferred_javascript/enabled',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
-        
+
         if ($enabled) {
 
             /* check if Amasty AMP enabled */
@@ -194,7 +194,7 @@ private function isAllowedOnPage()
         $this->allowedOnPage = false;
 
         $spPages = $this->scopeConfig->getValue(
-            'mfrocketjavascript/general/disallowed_pages_for_deferred_js',
+            'mfrocketjavascript/deferred_javascript/disallowed_pages_for_deferred_js',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $spPages = explode("\n", str_replace("\r", "\n", $spPages));