[Magento Community Engineering] Community Contributions - 2.3-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Store\Model\Store;
 
 /**
@@ -31,19 +32,28 @@ class Eraser
      */
     protected $storeManager;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param MetadataPool|null $metadataPool
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        MetadataPool $metadataPool = null
     ) {
         $this->productIndexerHelper = $productHelper;
         $this->connection = $resource->getConnection();
         $this->storeManager = $storeManager;
+        $this->metadataPool = $metadataPool ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(MetadataPool::class);
     }
 
     /**
@@ -81,17 +91,24 @@ public function removeDisabledProducts(array &$ids, $storeId)
         /* @var $statusAttribute \Magento\Eav\Model\Entity\Attribute */
         $statusAttribute = $this->productIndexerHelper->getAttribute('status');
 
+        /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */
+        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+
         $select = $this->getSelectForProducts($ids);
         $select->joinLeft(
             ['status_global_attr' => $statusAttribute->getBackendTable()],
             ' status_global_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
-            . ' AND status_global_attr.store_id = ' . Store::DEFAULT_STORE_ID,
+            . ' AND status_global_attr.store_id = ' . Store::DEFAULT_STORE_ID
+            . ' AND status_global_attr.' . $statusAttribute->getEntityIdField() . '='
+            . 'product_table.' . $metadata->getLinkField(),
             []
         );
         $select->joinLeft(
             ['status_attr' => $statusAttribute->getBackendTable()],
             ' status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
-            . ' AND status_attr.store_id = ' . $storeId,
+            . ' AND status_attr.store_id = ' . $storeId
+            . ' AND status_attr.' . $statusAttribute->getEntityIdField() . '='
+            . 'product_table.' . $metadata->getLinkField(),
             []
         );
         $select->where('IFNULL(status_attr.value, status_global_attr.value) = ?', Status::STATUS_DISABLED);

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

@@ -158,7 +158,8 @@ private function getUsedImagesSelect(): Select
                 'value as filepath'
             )->joinInner(
                 ['image_value' => $this->resourceConnection->getTableName(Gallery::GALLERY_VALUE_TABLE)],
-                'images.value_id = image_value.value_id'
+                'images.value_id = image_value.value_id',
+                []
             )->where(
                 'images.disabled = 0 AND image_value.disabled = 0'
             );

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/paging/sizes.js

@@ -9,21 +9,21 @@ define([
 
     return Sizes.extend({
         defaults: {
-            excludedOptions: ['100', '200']
-        },
-
-        /**
-         * @override
-         */
-        initialize: function () {
-            this._super();
-
-            this.excludedOptions.forEach(function (excludedOption) {
-                delete this.options[excludedOption];
-            }, this);
-            this.updateArray();
-
-            return this;
+            options: {
+                '20': {
+                    value: 20,
+                    label: 20
+                },
+                '30': {
+                    value: 30,
+                    label: 30
+                },
+                '50': {
+                    value: 50,
+                    label: 50
+                }
+            },
+            value: 20
         }
     });
 });