Merge pull request #12 from magefan/12223-convert-labels-in-ajax-requests

12223 replace label comments on labels in ajax requests

Author: magefan

Model/Parser/Html.php

@@ -8,7 +8,6 @@
 
 namespace Magefan\ProductLabel\Model\Parser;
 
-use Magento\Framework\App\RequestInterface;
 use Magefan\ProductLabel\Model\GetLabels;
 
 class Html
@@ -17,29 +16,15 @@ class Html
     const COMMENT_PREFIX_GALLERY = '<!--mf_product_label_gallery_comment_';
     const COMMENT_SUFFIX = '-->';
 
-    /**
-     * @var RequestInterface
-     */
-    protected $request;
-
-    /**
-     * @var
-     */
-    protected $fan;
-
     /**
      * @var GetLabels
      */
     protected $getLabels;
 
     public function __construct(
-        RequestInterface $request,
         GetLabels $getLabels
     ) {
-        $this->request = $request;
         $this->getLabels = $getLabels;
-
-        $this->fan = $this->request->getFullActionName();
     }
 
     /**
@@ -51,7 +36,7 @@ public function execute(string $output): string
         $isOutputIsJson = $this->json_validate($output);
 
         $productIds = $this->getProductIds($output);
-        $currentPageProductId = $this->fan == 'catalog_product_view' ? $this->getCurrentPageProductId($output) : 0;
+        $currentPageProductId = $this->getCurrentPageProductId($output);
         $productIdsForProductPage = [];
 
         if ($currentPageProductId) {

Plugin/Frontend/Magento/Framework/App/ActionInterface.php

@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magefan (support@magefan.com). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+declare(strict_types=1);
+
+namespace Magefan\ProductLabel\Plugin\Frontend\Magento\Framework\App;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magefan\ProductLabel\Model\Parser\Html;
+use Magefan\ProductLabel\Model\Config;
+
+class ActionInterface
+{
+    /**
+     * @var Html
+     */
+    protected $htmlParser;
+
+    /**
+     * @var Config
+     */
+    protected $config;
+
+    /**
+     * @var RequestInterface 
+     */
+    private $request;
+
+    /**
+     * @var ResponseInterface 
+     */
+    private $response;
+
+    /**
+     * ActionInterface constructor.
+     * @param Html $htmlParser
+     * @param Config $config
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function __construct(
+        Html $htmlParser,
+        Config $config,
+        RequestInterface $request,
+        ResponseInterface $response
+    ) {
+        $this->htmlParser = $htmlParser;
+        $this->config = $config;
+        $this->request = $request;
+        $this->response = $response;
+    }
+
+    /**
+     * @param $subject
+     * @param $response
+     * @return mixed
+     */
+    public function afterExecute($subject, $response)
+    {
+        if (!$this->canProcess($response)) {
+            return $response;
+        }
+
+
+
+        $html = $response->getBody();
+
+        if (
+            $html
+            && (
+                false !== strpos($html, Html::COMMENT_PREFIX) ||
+                false !== strpos($html, Html::COMMENT_PREFIX_GALLERY)
+            )
+        ) {
+
+            $response->setBody($this->htmlParser->execute($html));
+        }
+
+        return $response;
+    }
+
+    /**
+     * @return bool
+     */
+    private function canProcess($response): bool
+    {
+        return
+            $this->request->isAjax()
+            && $this->config->isEnabled()
+            && is_object($response)
+            && get_class($response) == 'Magento\Framework\App\Response\Http\Interceptor';
+    }
+}

etc/frontend/di.xml

@@ -10,9 +10,19 @@
     <type name="Magento\Catalog\Block\Product\Image">
         <plugin name="wrap_image_with_mf_comments" type="Magefan\ProductLabel\Plugin\Frontend\Magento\Catalog\Block\Product\Image" sortOrder="10" disabled="false"/>
     </type>
+
+    
+
     <type name="Magento\Framework\Controller\ResultInterface">
         <plugin name="replace_mf_comments_on_product_labels" type="Magefan\ProductLabel\Plugin\Frontend\Magento\Framework\Controller\ResultInterface" sortOrder="-21" disabled="false"/>
     </type>
+
+     <type name="Magento\Framework\App\ActionInterface">
+        <plugin name="replace_mf_comments_on_product_labels_in_ajax_requests" type="Magefan\ProductLabel\Plugin\Frontend\Magento\Framework\App\ActionInterface" sortOrder="10001"/>
+    </type>
+
+    
+
     <type name="Magento\Catalog\Block\Product\View\Gallery">
         <plugin name="wrap_gallery_image_with_mf_comments" type="Magefan\ProductLabel\Plugin\Frontend\Magento\Catalog\Block\Product\View\Gallery" sortOrder="10" disabled="false"/>
     </type>