ACP2E-1784: update update wishlist item link for configurable product

Author: alzota

app/code/Magento/Wishlist/Helper/Data.php

@@ -8,11 +8,14 @@
 
 namespace Magento\Wishlist\Helper;
 
+use Magento\Catalog\Model\Product;
 use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Framework\Escaper;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
+use Magento\Wishlist\Model\Item;
 
 /**
  * Wishlist Data Helper
@@ -319,14 +322,18 @@ public function getRemoveParams($item, $addReferer = false)
      */
     public function getConfigureUrl($item)
     {
-        return $this->_getUrl(
+        $query = $this->getItemQueryOptions($item);
+        $url = $this->_getUrl(
             'wishlist/index/configure',
             [
                 'id' => $item->getWishlistItemId(),
                 'product_id' => $item->getProductId(),
-                'qty' => (int)$item->getQty()
+                'qty' => (int)$item->getQty(),
             ]
         );
+        $url .= (isset($query['fragment']) && count($query['fragment'])) ?
+            '#' . http_build_query($query['fragment']) : '';
+        return $url;
     }
 
     /**
@@ -647,8 +654,29 @@ public function getProductUrl($item, $additional = [])
         } else {
             $product = $item->getProduct();
         }
+
+        $query = $this->getItemQueryOptions($item);
+        if (isset($query['product'])) {
+            $product = $query['product'];
+        }
+
+        $url = $product->getUrlModel()->getUrl($product, $query['additional'] ?? []);
+        if (isset($query['fragment']) && count($query['fragment'])) {
+            $url .= '#' . http_build_query($query['fragment']);
+        }
+
+        return $url;
+    }
+
+    /**
+     * @param Item|Product $item
+     * @return array
+     * @throws NoSuchEntityException
+     */
+    private function getItemQueryOptions(Item|Product $item): array
+    {
+        $query = [];
         $buyRequest = $item->getBuyRequest();
-        $fragment = [];
         if (is_object($buyRequest)) {
             $config = $buyRequest->getSuperProductConfig();
             if ($config && !empty($config['product_id'])) {
@@ -657,18 +685,14 @@ public function getProductUrl($item, $additional = [])
                     false,
                     $this->_storeManager->getStore()->getStoreId()
                 );
+                $query['product'] = $product;
             }
-            $fragment = $this->getFragmentByProductType($buyRequest);
+            $query['fragment'] = $this->getFragmentByProductType($buyRequest);
             if ($buyRequest->getQty()) {
-                $additional['_query']['qty'] = $buyRequest->getQty();
+                $query['additional']['_query']['qty'] = $buyRequest->getQty();
             }
         }
-        $url = $product->getUrlModel()->getUrl($product, $additional);
-        if ($fragment) {
-            $url .= '#' . http_build_query($fragment);
-        }
-
-        return $url;
+        return $query;
     }
 
     /**