Update develop with 1.x changes (#972)

- Fix configurable image condition (#964)
- Clean up adminhtml queue controllers (#968)
- Adminhtml improvements: XSS prevention, translations, etc (#939)
- Quickfix/landingpage url rewrite (#944)

Author: bsuravech

Controller/Adminhtml/Queue.php

@@ -5,7 +5,6 @@
 use Algolia\AlgoliaSearch\Model\JobFactory;
 use Algolia\AlgoliaSearch\Model\ResourceModel\Job as JobResourceModel;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Registry;
 use Magento\Indexer\Model\IndexerFactory;
 
@@ -23,10 +22,6 @@ abstract class AbstractAction extends \Magento\Backend\App\Action
     /** @var IndexerFactory */
     protected $indexerFactory;
 
-    protected $db;
-
-    protected $tableName;
-
     /**
      * @param Context          $context
      * @param Registry         $coreRegistry
@@ -39,17 +34,14 @@ public function __construct(
         Registry $coreRegistry,
         JobFactory $jobFactory,
         JobResourceModel $jobResourceModel,
-        IndexerFactory $indexerFactory,
-        ResourceConnection $resourceConnection
+        IndexerFactory $indexerFactory
     ) {
         parent::__construct($context);
 
         $this->coreRegistry     = $coreRegistry;
         $this->jobFactory       = $jobFactory;
         $this->jobResourceModel = $jobResourceModel;
         $this->indexerFactory   = $indexerFactory;
-        $this->db               = $resourceConnection->getConnection('core_write');
-        $this->tableName        = $resourceConnection->getTableName('algoliasearch_queue');
     }
 
     /** @return bool */

Controller/Adminhtml/Queue/AbstractAction.php

@@ -13,7 +13,9 @@ public function execute()
         $resultRedirect->setPath('*/*/index');
 
         try {
-            $this->db->query('TRUNCATE TABLE ' . $this->tableName);
+            $connection = $this->jobResourceModel->getConnection();
+            $connection->truncateTable($this->jobResourceModel->getMainTable());
+
             $this->messageManager->addNoticeMessage(__('Queue has been cleared.'));
         } catch (\Exception $e) {
             $this->messageManager->addExceptionMessage($e);

Controller/Adminhtml/Queue/Clear.php

@@ -147,7 +147,7 @@ class AssetHelper extends \Magento\Framework\App\Helper\AbstractHelper
                 'icon' => 'iconDocs',
             ],
             [
-                'title' => 'Documentation for magento2',
+                'title' => 'Documentation for Magento 2',
                 'url' => 'https://www.algolia.com/doc/integration/magento-2/how-it-works/click-and-conversion-analytics/?utm_source=magento&utm_medium=extension&utm_campaign=magento_2&utm_term=shop-owner&utm_content=doc-link',
                 'icon' => 'iconDocs',
             ],
@@ -252,7 +252,7 @@ protected function getVideoTemplate($section, $configNotSet)
                             <p>
                                 <span>Related video:</span>
                                 <a target="_blank" href="' . $config['url'] . '"><img src="' . $config['thumbnail'] . '"/></a>
-                                <a target="_blank" href="' . $config['url'] . '">' . $config['title'] . '</a>
+                                <a target="_blank" href="' . $config['url'] . '">' . __($config['title']) . '</a>
                             </p>
                         </div>';
         }
@@ -269,7 +269,7 @@ protected function getLinksTemplate($section)
             $links = '';
             $i = 0;
             foreach ($config as $link) {
-                $links .= '<span><img src="' . $this->icons[$link['icon']] . '"/><a target="_blank" href="' . $link['url'] . '">' . $link['title'] . '</a></span>';
+                $links .= '<span><img src="' . $this->icons[$link['icon']] . '"/><a target="_blank" href="' . $link['url'] . '">' . __($link['title']) . '</a></span>';
                 if ($i%2 == 1) {
                     $links .= '<br/>';
                 }

Controller/Adminhtml/Queue/Info.php

@@ -88,7 +88,7 @@ protected function initBaseFile()
     private function getProductImage(\Magento\Catalog\Model\Product\Image $model)
     {
         $imageUrl = $this->getProduct()->getData($model->getDestinationSubdir());
-        if ($this->getProduct()->getTypeId() == ProductTypeConfigurable::TYPE_CODE) {
+        if (($imageUrl === null || $imageUrl == '') && $this->getProduct()->getTypeId() == ProductTypeConfigurable::TYPE_CODE) {
             $imageUrl = $this->getType() !== 'image' && $this->getConfigurableProductImage() ?
                 $this->getConfigurableProductImage() : $this->getProduct()->getImage();
         }

Helper/Configuration/AssetHelper.php

@@ -64,7 +64,7 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init('Algolia\AlgoliaSearch\Model\ResourceModel\Job');
+        $this->_init(\Algolia\AlgoliaSearch\Model\ResourceModel\Job::class);
     }
 
     /**

Helper/Image.php

@@ -54,14 +54,18 @@ protected function _construct()
      */
     protected function _afterSave(AbstractModel $object)
     {
-        if ($object->dataHasChangedFor('url_key') || $object->dataHasChangedFor('store_id')) {
+        if ($object->dataHasChangedFor('url_key')
+            || $object->dataHasChangedFor('store_id')
+            || $object->dataHasChangedFor('is_active')) {
             $urls = $this->landingPageUrlRewriteGenerator->generate($object);
 
             $this->urlPersist->deleteByData([
                 UrlRewrite::ENTITY_ID => $object->getId(),
                 UrlRewrite::ENTITY_TYPE => LandingPageUrlRewriteGenerator::ENTITY_TYPE,
             ]);
-            $this->urlPersist->replace($urls);
+            if ($object->getIsActive()) {
+                $this->urlPersist->replace($urls);
+            }
         }
 
         return parent::_afterSave($object);

Model/Job.php

@@ -18,8 +18,8 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
     protected function _construct()
     {
         $this->_init(
-            'Algolia\AlgoliaSearch\Model\Run',
-            'Algolia\AlgoliaSearch\Model\ResourceModel\Run'
+            \Algolia\AlgoliaSearch\Model\Run::class,
+            \Algolia\AlgoliaSearch\Model\ResourceModel\Run::class
         );
     }
 }

Model/ResourceModel/LandingPage.php

@@ -20,7 +20,7 @@ class Run extends \Magento\Framework\Model\AbstractModel implements IdentityInte
      */
     protected function _construct()
     {
-        $this->_init('Algolia\AlgoliaSearch\Model\ResourceModel\Run');
+        $this->_init(\Algolia\AlgoliaSearch\Model\ResourceModel\Run::class);
     }
 
     /**