Merge remote-tracking branch 'hb/MAGETWO-89292-SDL' into MAGETWO-87654-Support-layered-navigation-in-one-query

Author: rganin

app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Magento\BundleGraphQl\Model;
 

app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php

@@ -115,47 +115,6 @@ public function execute()
         return $this;
     }
 
-    /**
-     * Return select for remove unnecessary data
-     *
-     * @return \Magento\Framework\DB\Select
-     *
-     * @deprecated Not used anymore.
-     * @see clearCurrentTable()
-     */
-    protected function getSelectUnnecessaryData()
-    {
-        return $this->connection->select()->from(
-            $this->getMainTable(),
-            []
-        )->joinLeft(
-            ['t' => $this->getMainTable()],
-            $this->getMainTable() .
-            '.category_id = t.category_id AND ' .
-            $this->getMainTable() .
-            '.store_id = t.store_id AND ' .
-            $this->getMainTable() .
-            '.product_id = t.product_id',
-            []
-        )->where(
-            't.category_id IS NULL'
-        );
-    }
-
-    /**
-     * Remove unnecessary data
-     *
-     * @return void
-     *
-     * @deprecated Not used anymore.
-     * @see clearCurrentTable()
-     */
-    protected function removeUnnecessaryData()
-    {
-        //Called for backward compatibility.
-        $this->getSelectUnnecessaryData();
-    }
-
     /**
      * Publish data from tmp to index
      *
@@ -254,8 +213,6 @@ private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSe
                 )
             );
             $this->publishData();
-            //Called for backward compatibility.
-            $this->removeUnnecessaryData();
         }
     }
 }

app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml

@@ -40,22 +40,10 @@
     </div>
 </div>
 <?php endif; ?>
-<?php if ($block->isRedirectToCartEnabled()) : ?>
-<script type="text/x-magento-init">
-    {
-        "#product_addtocart_form": {
-            "Magento_Catalog/product/view/validation": {
-                "radioCheckboxClosest": ".nested"
-            }
-        }
-    }
-</script>
-<?php else : ?>
 <script type="text/x-magento-init">
     {
         "#product_addtocart_form": {
             "Magento_Catalog/js/validate-product": {}
         }
     }
 </script>
-<?php endif; ?>

app/code/Magento/CatalogGraphQl/Model/CatalogProductTypeResolver.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Magento\CatalogGraphQl\Model;
 

app/code/Magento/CatalogGraphQl/Model/CustomizableOptionTypeResolver.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Magento\CatalogGraphQl\Model;
 

app/code/Magento/CatalogGraphQl/Model/ProductInterfaceTypeResolverComposite.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Magento\CatalogGraphQl\Model;
 

app/code/Magento/CatalogGraphQl/Model/ProductLinkTypeResolverComposite.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Magento\CatalogGraphQl\Model;
 

app/code/Magento/CatalogGraphQl/Model/ProductLinksTypeResolver.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Magento\CatalogGraphQl\Model;
 

app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
@@ -13,6 +13,7 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\Builder;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\SearchFilter;
 use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -38,6 +39,11 @@ class Products implements ResolverInterface
      */
     private $filterQuery;
 
+    /**
+     * @var SearchFilter
+     */
+    private $searchFilter;
+
     /**
      * @var ValueFactory
      */
@@ -58,12 +64,14 @@ public function __construct(
         Builder $searchCriteriaBuilder,
         Search $searchQuery,
         Filter $filterQuery,
+        SearchFilter $searchFilter,
         ValueFactory $valueFactory,
         \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
     ) {
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->searchQuery = $searchQuery;
         $this->filterQuery = $filterQuery;
+        $this->searchFilter = $searchFilter;
         $this->valueFactory = $valueFactory;
         $this->filtersDataProvider = $filtersDataProvider;
     }
@@ -78,13 +86,16 @@ public function resolve(
         array $value = null,
         array $args = null
     ) : Value {
-        $searchCriteria = $this->searchCriteriaBuilder->build($args);
+        $searchCriteria = $this->searchCriteriaBuilder->build($field->getName(), $args);
+$searchCriteria->setCurrentPage($args['currentPage']);
+        $searchCriteria->setPageSize($args['pageSize']);
         if (!isset($args['search']) && !isset($args['filter'])) {
             throw new GraphQlInputException(
                 __("'search' or 'filter' input argument is required.")
             );
         } elseif (isset($args['search'])) {
             $layerType = Resolver::CATALOG_LAYER_SEARCH;
+            $this->searchFilter->add($args['search'], $searchCriteria);
             $searchResult = $this->searchQuery->getResult($searchCriteria, $info);
         } else {
             $layerType = Resolver::CATALOG_LAYER_CATEGORY;

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php

@@ -127,7 +127,12 @@ private function fetch() : array
         }
 
         $this->searchCriteriaBuilder->addFilter(ProductInterface::SKU, $this->productSkus, 'in');
-        $result = $this->productDataProvider->getList($this->searchCriteriaBuilder->create(), $this->attributeCodes);
+        $result = $this->productDataProvider->getList(
+            $this->searchCriteriaBuilder->create(),
+            $this->attributeCodes,
+            false,
+            true
+        );
 
         /** @var \Magento\Catalog\Model\Product $product */
         foreach ($result->getItems() as $product) {