ACP2E-2978: Saving product by admin user with different role scope overwrites/deletes existing Related product information in the product

Author: glanujnehra

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

@@ -22,6 +22,7 @@
 use Magento\Catalog\Model\Product\LinkTypeProvider;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Locale\FormatInterface;
 use Magento\Framework\Stdlib\DateTime\Filter\Date;
 use Magento\Store\Model\StoreManagerInterface;
@@ -278,6 +279,7 @@ public function initialize(Product $product)
      * @param Product $product
      * @return Product
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @throws NoSuchEntityException
      * @since 101.0.0
      */
     protected function setProductLinks(Product $product)
@@ -300,34 +302,21 @@ protected function setProductLinks(Product $product)
             unset($linkTypes[$productLink->getLinkType()]);
         }
 
-        $isReadOnlyRelatedItems = $isReadOnlyUpSellItems = false;
+        $isReadOnlyUpSellItems = false;
         foreach ($linkTypes as $linkType => $readonly) {
-            if ($readonly) {
-                if ($linkType === 'related') {
-                    $isReadOnlyRelatedItems = true;
-                } elseif ($linkType === 'upsell') {
-                    $isReadOnlyUpSellItems = true;
-                }
-            }
+            $isReadOnlyRelatedItems = $readonly && $linkType === 'related' ||
+                ($isReadOnlyUpSellItems = $readonly && $linkType === 'upsell');
             if ($isReadOnlyRelatedItems && $isReadOnlyUpSellItems) {
                 $productLinks = null;
                 break;
             } else {
-                if (isset($links[$linkType]) && !$readonly) {
-                    foreach ((array) $links[$linkType] as $linkData) {
-                        if (empty($linkData['id'])) {
-                            continue;
-                        }
-
-                        $linkProduct = $this->productRepository->getById($linkData['id']);
-                        $link = $this->productLinkFactory->create();
-                        $link->setSku($product->getSku())
-                            ->setLinkedProductSku($linkProduct->getSku())
-                            ->setLinkType($linkType)
-                            ->setPosition(isset($linkData['position']) ? (int) $linkData['position'] : 0);
-                        $productLinks[] = $link;
-                    }
-                }
+                $productLinks = $this->setProductLinksForNotReadOnlyItems(
+                    $productLinks,
+                    $product,
+                    $links,
+                    $linkType,
+                    $readonly
+                );
             }
         }
 
@@ -536,4 +525,39 @@ private function setCategoryLinks(Product $product): void
         $extensionAttributes->setCategoryLinks(!empty($newCategoryLinks) ? $newCategoryLinks : null);
         $product->setExtensionAttributes($extensionAttributes);
     }
+
+    /**
+     * Set product links when readonly is false
+     *
+     * @param array $productLinks
+     * @param Product $product
+     * @param array $links
+     * @param string $linkType
+     * @param mixed $readonly
+     * @return array
+     * @throws NoSuchEntityException
+     */
+    private function setProductLinksForNotReadOnlyItems(
+        array $productLinks,
+        Product $product,
+        array $links,
+        string $linkType,
+        mixed $readonly
+    ): array {
+        if (isset($links[$linkType]) && !$readonly) {
+            foreach ((array)$links[$linkType] as $linkData) {
+                if (empty($linkData['id'])) {
+                    continue;
+                }
+                $linkProduct = $this->productRepository->getById($linkData['id']);
+                $link = $this->productLinkFactory->create();
+                $link->setSku($product->getSku())
+                ->setLinkedProductSku($linkProduct->getSku())
+                ->setLinkType($linkType)
+                ->setPosition(isset($linkData['position']) ? (int)$linkData['position'] : 0);
+                $productLinks[] = $link;
+            }
+        }
+        return $productLinks;
+    }
 }