Merge branch 'ACP2E-216' of https://github.com/magento-l3/magento2ce into L3-PR-20211001

Author: ArtemVasyliev

app/code/Magento/ConfigurableProduct/Test/Unit/Ui/Component/Listing/AssociatedProduct/Columns/AttributesTest.php

@@ -109,10 +109,13 @@ public function testPrepareDataSource()
         $name = 'some_name';
         $initialData = [
             'data' => [
+                'totalRecords' => 4,
                 'items' => [
-                    ['attribute1_1_code' => 'attribute1_1_option2'],
-                    ['attribute2_1_code' => 'attribute2_1_option3'],
-                    ['attribute3_1_code' => 'attribute3_1_option3', 'attribute3_2_code' => 'attribute3_2_option1']
+                    ['attribute1_1_code' => 'attribute1_1_option2', 'required_options' => '0'],
+                    ['attribute2_1_code' => 'attribute2_1_option3', 'required_options' => '0'],
+                    ['attribute3_1_code' => 'attribute3_1_option3', 'attribute3_2_code' => 'attribute3_2_option1',
+                        'required_options' => '0'],
+                    ['attribute4_1_code' => 'attribute4_1_option1', 'required_options' => '1']
                 ]
             ]
         ];
@@ -158,18 +161,22 @@ public function testPrepareDataSource()
         ];
         $resultData = [
             'data' => [
+                'totalRecords' => 3,
                 'items' => [
                     [
                         'attribute1_1_code' => 'attribute1_1_option2',
+                        'required_options' => '0',
                         $name => 'attribute1_1_label: attribute1_1_option2_label'
                     ],
                     [
                         'attribute2_1_code' => 'attribute2_1_option3',
+                        'required_options' => '0',
                         $name => ''
                     ],
                     [
                         'attribute3_1_code' => 'attribute3_1_option3',
                         'attribute3_2_code' => 'attribute3_2_option1',
+                        'required_options' => '0',
                         $name => 'attribute3_1_label: attribute3_1_option3_label,'
                             . ' attribute3_2_label: attribute3_2_option1_label'
                     ]
@@ -187,7 +194,9 @@ public function testPrepareDataSource()
             ->method('getItems')
             ->willReturn($attributes);
 
-        $this->assertSame($resultData, $this->attributesColumn->prepareDataSource($initialData));
+        $actualResultItems = $this->attributesColumn->prepareDataSource($initialData);
+        $this->assertSame($resultData['data']['items'], $actualResultItems['data']['items']);
+        $this->assertSame($resultData['data']['totalRecords'], count($actualResultItems['data']['items']));
     }
 
     /**

app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Attributes.php

@@ -59,9 +59,15 @@ public function prepareDataSource(array $dataSource)
         if (isset($dataSource['data']['items'])) {
             $attributes = $this->getAttributes();
             $fieldName = $this->getData('name');
-            foreach ($dataSource['data']['items'] as & $item) {
+            foreach ($dataSource['data']['items'] as $key => & $item) {
                 $attrStrings = [];
                 foreach ($attributes as $attributeCode => $attribute) {
+                    if ($item['required_options'] === "1") {
+                        unset($dataSource['data']['items'][$key]);
+                        $dataSource['data']['totalRecords']--;
+                        continue;
+                    }
+
                     if (isset($item[$attributeCode]) && isset($attribute['options'][$item[$attributeCode]])) {
                         $attrStrings[] = $attribute['label'] . ': ' . $attribute['options'][$item[$attributeCode]];
                     }
@@ -71,6 +77,7 @@ public function prepareDataSource(array $dataSource)
             }
         }
 
+        $dataSource['data']['items'] = array_values($dataSource['data']['items']);
         return $dataSource;
     }
 

app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/GroupedProductDataProviderTest.php

@@ -112,9 +112,9 @@ public function testGetData()
         $this->collectionMock->expects($this->once())
             ->method('isLoaded')
             ->willReturn(false);
-        $this->collectionMock->expects($this->once())
+        $this->collectionMock->expects($this->any())
             ->method('addAttributeToFilter')
-            ->with('type_id', [self::ALLOWED_TYPE]);
+            ->withConsecutive(['type_id', [self::ALLOWED_TYPE]], ['required_options', '0']);
         $this->collectionMock->expects($this->once())
             ->method('toArray')
             ->willReturn($items);

app/code/Magento/GroupedProduct/Ui/DataProvider/Product/GroupedProductDataProvider.php

@@ -7,11 +7,13 @@
 
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider;
-use Magento\GroupedProduct\Model\Product\Type\Grouped as GroupedProductType;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Catalog\Model\ProductTypes\ConfigInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Ui\DataProvider\AddFieldToCollectionInterface;
+use Magento\Ui\DataProvider\AddFilterToCollectionInterface;
 
 class GroupedProductDataProvider extends ProductDataProvider
 {
@@ -38,12 +40,12 @@ class GroupedProductDataProvider extends ProductDataProvider
      * @param string $requestFieldName
      * @param CollectionFactory $collectionFactory
      * @param RequestInterface $request
-     * @param StoreRepositoryInterface $storeRepository
      * @param ConfigInterface $config
-     * @param \Magento\Ui\DataProvider\AddFieldToCollectionInterface[] $addFieldStrategies
-     * @param \Magento\Ui\DataProvider\AddFilterToCollectionInterface[] $addFilterStrategies
+     * @param StoreRepositoryInterface $storeRepository
      * @param array $meta
      * @param array $data
+     * @param AddFieldToCollectionInterface[] $addFieldStrategies
+     * @param AddFilterToCollectionInterface[] $addFilterStrategies
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -79,6 +81,7 @@ public function __construct(
      * Get data
      *
      * @return array
+     * @throws NoSuchEntityException
      */
     public function getData()
     {
@@ -87,6 +90,10 @@ public function getData()
                 'type_id',
                 $this->config->getComposableTypes()
             );
+            $this->getCollection()->addAttributeToFilter(
+                'required_options',
+                '0'
+            );
             if ($storeId = $this->request->getParam('current_store_id')) {
                 /** @var StoreInterface $store */
                 $store = $this->storeRepository->getById($storeId);