MAGETWO-50370: There is no ability to "Save as a new update" for grouped product

fixed to be updated with mainline

Author: Serhiy Shkolyarenko

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -202,6 +202,7 @@ public function initialize(\Magento\Catalog\Model\Product $product)
     }
 
     /**
+     * @deprecated
      * @return LinkResolver
      */
     private function getLinkResolver()

app/code/Magento/Catalog/Model/Product/Link/Converter.php

@@ -32,15 +32,17 @@ protected function indexBySku(array $products)
     public function convertLinksToGroupedArray($entity)
     {
         $basicData = $entity->getProductLinks();
-        $additionalData = $entity->getTypeInstance()->getAssociatedProducts($entity);
-        $additionalData = $this->indexBySku($additionalData);
+        $associatedProducts = $entity->getTypeInstance()->getAssociatedProducts($entity);
+        $associatedProducts = $this->indexBySku($associatedProducts);
 
         /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $link */
         foreach ($basicData as $link) {
-            $info = [];
-            $info['id'] = $additionalData[$link->getLinkedProductSku()]->getId();
-            $info['sku'] = $link->getLinkedProductSku();
-            $info['position'] = $link->getPosition();
+            $info = $link->getData();
+            if ($link->getLinkType() == 'associated') {
+                $info['id'] = $associatedProducts[$link->getLinkedProductSku()]->getId();
+            }
+//            $info['sku'] = $link->getLinkedProductSku();
+//            $info['position'] = $link->getPosition();
             $info = array_merge($info, $link->getExtensionAttributes()->__toArray());
             $linksAsArray[$link->getLinkType()][] = $info;
         }

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -96,6 +96,11 @@ class HelperTest extends \PHPUnit_Framework_TestCase
      */
     protected $customOptionMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $linkResolverMock;
+
     /**
      * @var ProductLinks
      */
@@ -175,6 +180,14 @@ protected function setUp()
             'productLinkFactory' => $this->productLinkFactoryMock,
             'productRepository' => $this->productRepositoryMock,
         ]);
+
+        $this->linkResolverMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Link\Resolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $helperReflection = new \ReflectionClass(get_class($this->helper));
+        $resolverProperty = $helperReflection->getProperty('linkResolver');
+        $resolverProperty->setAccessible(true);
+        $resolverProperty->setValue($this->helper, $this->linkResolverMock);
     }
 
     /**
@@ -248,10 +261,7 @@ public function testInitialize()
             ->method('getPost')
             ->with('use_default')
             ->willReturn($useDefaults);
-        $this->requestMock->expects($this->at(3))
-            ->method('getPost')
-            ->with('options_use_default')
-            ->willReturn(true);
+        $this->linkResolverMock->expects($this->once())->method('getLinks')->willReturn([]);
         $this->stockFilterMock->expects($this->once())
             ->method('filter')
             ->with(['stock_data'])

app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php

@@ -272,7 +272,7 @@ public function testDeleteWithInvalidDataException()
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Product with SKU linkedProduct is not linked to product with SKU product
+     * @expectedExceptionMessage Product with SKU 'linkedProduct' is not linked to product with SKU 'product'
      */
     public function testDeleteWithNoSuchEntityException()
     {