Merge pull request #2306 from magento-engcom/msi-core-changes-no-history-2

[EngCom] Various fixes in Magento 2 core to support MSI

Author: Volodymyr Kublytskyi

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

@@ -5,7 +5,7 @@
  */
 -->
 
-<div class="admin__field-complex" if="element.addButton">
+<div class="admin__field-complex" if="$data.addButton">
     <div class="admin__field-complex-title">
         <span class="label" translate="'User Agent Rules'"></span>
     </div>
@@ -27,10 +27,10 @@
 <div class="admin__field admin__field-wide"
      visible="visible"
      disabled="disabled"
-     css="element.setClasses(element)"
+     css="$data.setClasses($data)"
      attr="'data-index': index">
-    <label if="element.label" class="admin__field-label" attr="for: element.uid">
-        <span translate="element.label"/>
+    <label if="$data.label" class="admin__field-label" attr="for: $data.uid">
+        <span translate="$data.label"/>
     </label>
 
     <div class="admin__field-control" data-role="grid-wrapper">

app/code/Magento/Catalog/Model/ResourceModel/Product.php

@@ -505,11 +505,29 @@ public function getProductsIdsBySkus(array $productSkuList)
 
         $result = [];
         foreach ($this->getConnection()->fetchAll($select) as $row) {
-            $result[$row['sku']] = $row['entity_id'];
+            $result[$this->getResultKey($row['sku'], $productSkuList)] = $row['entity_id'];
         }
         return $result;
     }
 
+    /**
+     * Return correct key for result array in getProductIdsBySku
+     * Allows for different case sku to be passed in search array
+     * with original cased sku to be passed back in result array
+     *
+     * @param string $sku
+     * @param array $productSkuList
+     * @return string
+     */
+    private function getResultKey(string $sku, array $productSkuList): string
+    {
+        $key = array_search(strtolower($sku), array_map('strtolower', $productSkuList));
+        if ($key !== false) {
+            $sku = $productSkuList[$key];
+        }
+        return $sku;
+    }
+
     /**
      * Retrieve product entities info
      *

app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php

@@ -6,6 +6,9 @@
 namespace Magento\Catalog\Ui\DataProvider\Product;
 
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Ui\DataProvider\Modifier\ModifierInterface;
+use Magento\Ui\DataProvider\Modifier\PoolInterface;
 
 /**
  * Class ProductDataProvider
@@ -33,8 +36,11 @@ class ProductDataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
     protected $addFilterStrategies;
 
     /**
-     * Construct
-     *
+     * @var PoolInterface
+     */
+    private $modifiersPool;
+
+    /**
      * @param string $name
      * @param string $primaryFieldName
      * @param string $requestFieldName
@@ -43,6 +49,7 @@ class ProductDataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param \Magento\Ui\DataProvider\AddFilterToCollectionInterface[] $addFilterStrategies
      * @param array $meta
      * @param array $data
+     * @param PoolInterface|null $modifiersPool
      */
     public function __construct(
         $name,
@@ -52,12 +59,14 @@ public function __construct(
         array $addFieldStrategies = [],
         array $addFilterStrategies = [],
         array $meta = [],
-        array $data = []
+        array $data = [],
+        PoolInterface $modifiersPool = null
     ) {
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
         $this->collection = $collectionFactory->create();
         $this->addFieldStrategies = $addFieldStrategies;
         $this->addFilterStrategies = $addFilterStrategies;
+        $this->modifiersPool = $modifiersPool ?: ObjectManager::getInstance()->get(PoolInterface::class);
     }
 
     /**
@@ -72,10 +81,16 @@ public function getData()
         }
         $items = $this->getCollection()->toArray();
 
-        return [
+        $data = [
             'totalRecords' => $this->getCollection()->getSize(),
             'items' => array_values($items),
         ];
+
+        /** @var ModifierInterface $modifier */
+        foreach ($this->modifiersPool->getModifiersInstances() as $modifier) {
+            $data = $modifier->modifyData($data);
+        }
+        return $data;
     }
 
     /**
@@ -110,4 +125,19 @@ public function addFilter(\Magento\Framework\Api\Filter $filter)
             parent::addFilter($filter);
         }
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMeta()
+    {
+        $meta = parent::getMeta();
+
+        /** @var ModifierInterface $modifier */
+        foreach ($this->modifiersPool->getModifiersInstances() as $modifier) {
+            $meta = $modifier->modifyMeta($meta);
+        }
+
+        return $meta;
+    }
 }

app/code/Magento/Catalog/etc/adminhtml/di.xml

@@ -92,6 +92,7 @@
                 <item name="store_id" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\AddStoreFieldToCollection</item>
             </argument>
             <argument name="collectionFactory" xsi:type="object">\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory</argument>
+            <argument name="modifiersPool" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\Listing\Modifier\Pool</argument>
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\Product\Action">
@@ -165,6 +166,7 @@
             <argument name="pool" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Pool</argument>
         </arguments>
     </type>
+    <virtualType name="Magento\Catalog\Ui\DataProvider\Product\Listing\Modifier\Pool" type="Magento\Ui\DataProvider\Modifier\Pool"/>
     <type name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\CustomOptions">
         <arguments>
             <argument name="scopeName" xsi:type="string">product_form.product_form</argument>

app/code/Magento/CatalogInventory/Helper/Stock.php

@@ -17,6 +17,7 @@
 /**
  * Class Stock
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @api
  */
 class Stock
 {

app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php

@@ -12,6 +12,7 @@
 /**
  * CatalogInventory Stock Status per website Resource Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @api
  */
 class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {

app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php

@@ -130,4 +130,16 @@ public function removeStockStatus($productId, $scopeId = null)
             unset($this->stockStatuses[$productId][$scopeId]);
         }
     }
+
+    /**
+     * Clear cached entities
+     *
+     * @return void
+     */
+    public function clean()
+    {
+        $this->stockItems = [];
+        $this->stocks = [];
+        $this->stockStatuses = [];
+    }
 }

app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php

@@ -63,11 +63,11 @@ public function execute(EventObserver $observer)
      */
     private function processStockData(Product $product)
     {
-        /** @var Item $stockItem */
-        $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
-
         $quantityAndStockStatus = $product->getData('quantity_and_stock_status');
         if (is_array($quantityAndStockStatus)) {
+            /** @var Item $stockItem */
+            $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
+
             $quantityAndStockStatus = $this->prepareQuantityAndStockStatus($stockItem, $quantityAndStockStatus);
 
             if ($quantityAndStockStatus) {

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php

@@ -210,7 +210,6 @@ private function prepareMeta()
                     'scopeLabel' => '[GLOBAL]',
                 ]
             );
-
             $container['arguments']['data']['config'] = [
                 'formElement' => 'container',
                 'componentType' => 'container',
@@ -227,6 +226,7 @@ private function prepareMeta()
             ];
             $qty['arguments']['data']['config'] = [
                 'component' => 'Magento_CatalogInventory/js/components/qty-validator-changer',
+                'group' => 'quantity_and_stock_status_qty',
                 'dataType' => 'number',
                 'formElement' => 'input',
                 'componentType' => 'field',

app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

@@ -99,6 +99,9 @@
                     </validation>
                     <label translate="true">Qty</label>
                     <dataScope>quantity_and_stock_status.qty</dataScope>
+                    <links>
+                        <link name="value">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:value</link>
+                    </links>
                     <imports>
                         <link name="handleChanges">${$.provider}:data.product.stock_data.is_qty_decimal</link>
                         <link name="visible">${$.provider}:data.product.stock_data.manage_stock</link>

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php

@@ -3,77 +3,63 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation;
 
 use Magento\Catalog\Model\Product;
-use Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\QueryBuilder;
-use Magento\Customer\Model\Session;
+use Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\SelectBuilderForAttribute;
 use Magento\Eav\Model\Config;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
 use Magento\Framework\Search\Request\BucketInterface;
-use Magento\Framework\App\ObjectManager;
 
-/**
- * DataProvider for Catalog search Mysql.
- */
 class DataProvider implements DataProviderInterface
 {
     /**
      * @var Config
      */
     private $eavConfig;
 
-    /**
-     * @var Resource
-     */
-    private $resource;
-
     /**
      * @var ScopeResolverInterface
      */
     private $scopeResolver;
 
-    /**
-     * @var Session
-     */
-    private $customerSession;
-
     /**
      * @var AdapterInterface
      */
     private $connection;
 
     /**
-     * @var QueryBuilder;
+     * @var SelectBuilderForAttribute
      */
-    private $queryBuilder;
+    private $selectBuilderForAttribute;
 
     /**
      * @param Config $eavConfig
      * @param ResourceConnection $resource
      * @param ScopeResolverInterface $scopeResolver
-     * @param Session $customerSession
-     * @param QueryBuilder|null $queryBuilder
+     * @param null $customerSession @deprecated
+     * @param SelectBuilderForAttribute|null $selectBuilderForAttribute
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Config $eavConfig,
         ResourceConnection $resource,
         ScopeResolverInterface $scopeResolver,
-        Session $customerSession,
-        QueryBuilder $queryBuilder = null
+        $customerSession,
+        SelectBuilderForAttribute $selectBuilderForAttribute = null
     ) {
         $this->eavConfig = $eavConfig;
-        $this->resource = $resource;
         $this->connection = $resource->getConnection();
         $this->scopeResolver = $scopeResolver;
-        $this->customerSession = $customerSession;
-        $this->queryBuilder = $queryBuilder ?: ObjectManager::getInstance()->get(QueryBuilder::class);
+        $this->selectBuilderForAttribute = $selectBuilderForAttribute
+            ?: ObjectManager::getInstance()->get(SelectBuilderForAttribute::class);
     }
 
     /**
@@ -85,15 +71,15 @@ public function getDataSet(
         Table $entityIdsTable
     ) {
         $currentScope = $this->scopeResolver->getScope($dimensions['scope']->getValue())->getId();
-
         $attribute = $this->eavConfig->getAttribute(Product::ENTITY, $bucket->getField());
+        $select = $this->getSelect();
 
-        $select = $this->queryBuilder->build(
-            $attribute,
-            $entityIdsTable->getName(),
-            $currentScope,
-            $this->customerSession->getCustomerGroupId()
+        $select->joinInner(
+            ['entities' => $entityIdsTable->getName()],
+            'main_table.entity_id  = entities.entity_id',
+            []
         );
+        $select = $this->selectBuilderForAttribute->build($select, $attribute, $currentScope);
 
         return $select;
     }
@@ -105,4 +91,12 @@ public function execute(Select $select)
     {
         return $this->connection->fetchAssoc($select);
     }
+
+    /**
+     * @return Select
+     */
+    private function getSelect()
+    {
+        return $this->connection->select();
+    }
 }