From 3319266f1057043a823c1f9857ab248105262f42 Mon Sep 17 00:00:00 2001
From: Mallika Verma <mallikaverma@cedcoss.com>
Date: Sun, 2 Feb 2020 14:10:54 +0530
Subject: [PATCH 1/2] Fixed issue 22409

---
 .../Associated/AssociatedDataProvider.php     | 172 ++++++++++++++++++
 .../Form/Modifier/ConfigurablePanel.php       |   2 +-
 ...onfigurable_associated_product_listing.xml |   2 +-
 .../Model/Product/Type/Grouped.php            |   7 +
 4 files changed, 181 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Associated/AssociatedDataProvider.php

diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Associated/AssociatedDataProvider.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Associated/AssociatedDataProvider.php
new file mode 100644
index 0000000000000..bbf21e0c911b3
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Associated/AssociatedDataProvider.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Associated;
+
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Ui\DataProvider\Modifier\PoolInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Store\Api\Data\StoreInterface;
+
+/**
+ * Class AssociatedDataProvider
+ *
+ */
+class AssociatedDataProvider extends \Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider
+{
+
+    /**
+     * @var ProductFactory
+     */
+    private $productFactory;
+
+    /**
+     * @var \Magento\Ui\DataProvider\AddFieldToCollectionInterface[]
+     */
+    protected $addFieldStrategies;
+
+    /**
+     * @var \Magento\Ui\DataProvider\AddFilterToCollectionInterface[]
+     */
+    protected $addFilterStrategies;
+
+    /**
+     * @var StoreInterface
+     */
+    private $store;
+
+    /**
+     * @var Configurable
+     */
+    protected $configurableType;
+
+    /**
+     * @var LocatorInterface
+     */
+    protected $locator;
+
+    /**
+     * @var RequestInterface
+     */
+    protected $request;
+
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+
+    /**
+     * AssociatedDataProvider constructor.
+     * @param Configurable $configurableType
+     * @param ProductFactory $productFactory
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param CollectionFactory $collectionFactory
+     * @param array $addFieldStrategies
+     * @param array $addFilterStrategies
+     * @param array $meta
+     * @param array $data
+     * @param LocatorInterface $locator
+     * @param PoolInterface|null $modifiersPool
+     * @param StoreRepositoryInterface $storeRepository
+     * @param ProductRepositoryInterface $productRepository
+     * @param RequestInterface $request
+     */
+    public function __construct(
+        Configurable $configurableType,
+        ProductFactory $productFactory,
+        $name,
+        $primaryFieldName,
+        $requestFieldName,
+        CollectionFactory $collectionFactory,
+        array $addFieldStrategies = [],
+        array $addFilterStrategies = [],
+        array $meta = [],
+        array $data = [],
+        LocatorInterface $locator,
+        PoolInterface $modifiersPool = null,
+        StoreRepositoryInterface $storeRepository,
+        ProductRepositoryInterface $productRepository,
+        RequestInterface $request
+    ) {
+        $this->_configurableType = $configurableType;
+        $this->productFactory= $productFactory;
+        $this->locator = $locator;
+        $this->request = $request;
+        $this->storeRepository = $storeRepository;
+        $this->productRepository = $productRepository;
+        parent::__construct($name, $primaryFieldName, $requestFieldName, $collectionFactory, $addFieldStrategies, $addFilterStrategies, $meta, $data);
+    }
+
+    /**
+     * @return Collection|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+     */
+    public function getCollection()
+    {
+        /** @var Collection $collection */
+        $collection = parent::getCollection();
+        $collection->addAttributeToSelect('status');
+
+
+        if ($this->getStore()) {
+            $collection->setStore($this->getStore());
+        }
+
+        $collection->addFieldToFilter(
+            'type_id',
+            ['in' => [
+                \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE,
+                \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL,
+                \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE
+            ]]
+        );
+
+        $product = $this->_getProduct();
+        foreach ((array)$this->_configurableType->getConfigurableAttributesAsArray($product) as $attribute) {
+            $collection->addAttributeToSelect($attribute['attribute_code']);
+            $collection->addAttributeToFilter($attribute['attribute_code'], array('notnull' => 1));
+        }
+
+        return $collection;
+    }
+
+    /**
+     * Get product
+     *
+     * @return \Magento\Catalog\Model\Product
+     */
+    private function _getProduct()
+    {
+        $product_id = (int) $this->request->getParam('id');
+        return $this->productFactory->create()->load($product_id);
+    }
+
+    /**
+     * Retrieve store
+     *
+     * @return StoreInterface|null
+     * @since 101.0.0
+     */
+    private function getStore()
+    {
+        if (null !== $this->store) {
+            return $this->store;
+        }
+
+        if (!($storeId = $this->request->getParam('current_store_id'))) {
+            return null;
+        }
+
+        return $this->store = $this->storeRepository->getById($storeId);
+    }
+
+}
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
index 16119dcb5c866..96aaddff6a33e 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
@@ -207,7 +207,7 @@ public function modifyMeta(array $meta)
                                             . $this->associatedListingPrefix
                                             . static::ASSOCIATED_PRODUCT_LISTING . '.product_columns.ids',
                                         'ns' => $this->associatedListingPrefix . static::ASSOCIATED_PRODUCT_LISTING,
-                                        'render_url' => $this->urlBuilder->getUrl('mui/index/render'),
+                                        'render_url' => $this->urlBuilder->getUrl('mui/index/render', ['id' => $this->locator->getProduct()->getId()]),
                                         'realTimeLink' => true,
                                         'behaviourType' => 'simple',
                                         'externalFilterMode' => false,
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/configurable_associated_product_listing.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/configurable_associated_product_listing.xml
index 2a40caaabae04..d6de3c5fb352e 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/configurable_associated_product_listing.xml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/configurable_associated_product_listing.xml
@@ -25,7 +25,7 @@
             <updateUrl path="mui/index/render"/>
         </settings>
         <aclResource>Magento_Catalog::products</aclResource>
-        <dataProvider class="Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider" name="data_source">
+        <dataProvider class="Magento\ConfigurableProduct\Ui\DataProvider\Product\Associated\AssociatedDataProvider" name="data_source">
             <settings>
                 <requestFieldName>id</requestFieldName>
                 <primaryFieldName>entity_id</primaryFieldName>
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
index 8eac8d0b0e163..0c65e29c63b67 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -218,6 +218,13 @@ public function getAssociatedProducts($product)
                 ['in' => $this->getStatusFilters($product)]
             );
 
+            $collection->getSelect()
+                ->joinInner(
+                    'cataloginventory_stock_item',
+                    'e.entity_id=cataloginventory_stock_item.product_id AND cataloginventory_stock_item.is_in_stock ="1"',
+                    ['is_in_stock']
+                );
+                
             foreach ($collection as $item) {
                 $associatedProducts[] = $item;
             }

From 0c358b2a5d51eba9b94566338ec20e8499b88533 Mon Sep 17 00:00:00 2001
From: Mallika Verma <mallikaverma@cedcoss.com>
Date: Sun, 2 Feb 2020 14:28:11 +0530
Subject: [PATCH 2/2] removed wrong commit file

---
 .../Magento/GroupedProduct/Model/Product/Type/Grouped.php  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
index 0c65e29c63b67..8eac8d0b0e163 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -218,13 +218,6 @@ public function getAssociatedProducts($product)
                 ['in' => $this->getStatusFilters($product)]
             );
 
-            $collection->getSelect()
-                ->joinInner(
-                    'cataloginventory_stock_item',
-                    'e.entity_id=cataloginventory_stock_item.product_id AND cataloginventory_stock_item.is_in_stock ="1"',
-                    ['is_in_stock']
-                );
-                
             foreach ($collection as $item) {
                 $associatedProducts[] = $item;
             }