MC-15574: Fix associated product grid

Author: svitja

app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php

@@ -357,38 +357,13 @@ protected function prepareVariations()
                     $price = $product->getPrice();
                     $variationOptions = [];
                     foreach ($usedProductAttributes as $attribute) {
-                        if (!isset($attributes[$attribute->getAttributeId()])) {
-                            $attributes[$attribute->getAttributeId()] = [
-                                'code' => $attribute->getAttributeCode(),
-                                'label' => $attribute->getStoreLabel(),
-                                'id' => $attribute->getAttributeId(),
-                                'position' => $configurableAttributes[$attribute->getAttributeId()]['position'],
-                                'chosen' => [],
-                            ];
-                            foreach ($attribute->getOptions() as $option) {
-                                if (!empty($option->getValue())) {
-                                    $attributes[$attribute->getAttributeId()]['options'][] = [
-                                        'attribute_code' => $attribute->getAttributeCode(),
-                                        'attribute_label' => $attribute->getStoreLabel(0),
-                                        'id' => $option->getValue(),
-                                        'label' => $option->getLabel(),
-                                        'value' => $option->getValue(),
-                                        '__disableTmpl' => true,
-                                    ];
-                                }
-                            }
-                        }
-                        $optionId = $variation[$attribute->getId()]['value'];
-                        $variationOption = [
-                            'attribute_code' => $attribute->getAttributeCode(),
-                            'attribute_label' => $attribute->getStoreLabel(0),
-                            'id' => $optionId,
-                            'label' => $variation[$attribute->getId()]['label'],
-                            'value' => $optionId,
-                            '__disableTmpl' => true,
-                        ];
-                        $variationOptions[] = $variationOption;
-                        $attributes[$attribute->getAttributeId()]['chosen'][] = $variationOption;
+                        list($attributes, $variationOptions) = $this->prepareAttributes(
+                            $attributes,
+                            $attribute,
+                            $configurableAttributes,
+                            $variation,
+                            $variationOptions
+                        );
                     }
 
                     $productMatrix[] = [
@@ -411,4 +386,57 @@ protected function prepareVariations()
         $this->productMatrix = $productMatrix;
         $this->productAttributes = array_values($attributes);
     }
+
+    /**
+     * Prepare attributes.
+     *
+     * @param array $attributes
+     * @param object $attribute
+     * @param array $configurableAttributes
+     * @param array $variation
+     * @param array $variationOptions
+     * @return array
+     */
+    private function prepareAttributes(
+        array $attributes,
+        $attribute,
+        array $configurableAttributes,
+        array $variation,
+        array $variationOptions
+    ): array {
+        if (!isset($attributes[$attribute->getAttributeId()])) {
+            $attributes[$attribute->getAttributeId()] = [
+                'code' => $attribute->getAttributeCode(),
+                'label' => $attribute->getStoreLabel(),
+                'id' => $attribute->getAttributeId(),
+                'position' => $configurableAttributes[$attribute->getAttributeId()]['position'],
+                'chosen' => [],
+            ];
+            foreach ($attribute->getOptions() as $option) {
+                if (!empty($option->getValue())) {
+                    $attributes[$attribute->getAttributeId()]['options'][] = [
+                        'attribute_code' => $attribute->getAttributeCode(),
+                        'attribute_label' => $attribute->getStoreLabel(0),
+                        'id' => $option->getValue(),
+                        'label' => $option->getLabel(),
+                        'value' => $option->getValue(),
+                        '__disableTmpl' => true,
+                    ];
+                }
+            }
+        }
+        $optionId = $variation[$attribute->getId()]['value'];
+        $variationOption = [
+            'attribute_code' => $attribute->getAttributeCode(),
+            'attribute_label' => $attribute->getStoreLabel(0),
+            'id' => $optionId,
+            'label' => $variation[$attribute->getId()]['label'],
+            'value' => $optionId,
+            '__disableTmpl' => true,
+        ];
+        $variationOptions[] = $variationOption;
+        $attributes[$attribute->getAttributeId()]['chosen'][] = $variationOption;
+
+        return [$attributes, $variationOptions];
+    }
 }