ACP2E-267: GraphQl - Issues with add Configurable product to Wishlist

Author: bubasuma

app/code/Magento/ConfigurableProductGraphQl/Model/Wishlist/SelectedVariantSku.php renamed to app/code/Magento/ConfigurableProductGraphQl/Model/Wishlist/ConfiguredVariant.php

@@ -8,16 +8,30 @@
 namespace Magento\ConfigurableProductGraphQl\Model\Wishlist;
 
 use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\CatalogGraphQl\Model\ProductDataProvider;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
- * Fetches the selected variant SKU of configurable product
+ * Fetches the data of selected variant of configurable product
  */
-class SelectedVariantSku implements ResolverInterface
+class ConfiguredVariant implements ResolverInterface
 {
+    /**
+     * @var ProductDataProvider
+     */
+    private $productDataProvider;
+
+    /**
+     * @param ProductDataProvider $productDataProvider
+     */
+    public function __construct(ProductDataProvider $productDataProvider)
+    {
+        $this->productDataProvider = $productDataProvider;
+    }
+
     /**
      * @inheritdoc
      */
@@ -38,6 +52,8 @@ public function resolve(
         $product = $item->getProduct();
         $option = $product->getCustomOption('simple_product');
 
-        return $option && $option->getProduct() ? $option->getProduct()->getSku() : null;
+        return $option && $option->getProduct()
+            ? $this->productDataProvider->getProductDataById((int) $option->getProduct()->getId())
+            : null;
     }
 }

app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls

@@ -77,9 +77,9 @@ type SelectedConfigurableOption @doc(description: "Contains details about a sele
 }
 
 type ConfigurableWishlistItem implements WishlistItemInterface @doc(description: "A configurable product wish list item."){
-    child_sku: String! @deprecated(reason: "Use `ConfigurableWishlistItem.selected_variant_sku` instead.") @doc(description: "The SKU of the simple product corresponding to a set of selected configurable options.") @resolver(class: "\\Magento\\ConfigurableProductGraphQl\\Model\\Wishlist\\ChildSku")
-    selected_variant_sku: String @doc(description: "The SKU of the simple product corresponding to a set of selected configurable options.") @resolver(class: "\\Magento\\ConfigurableProductGraphQl\\Model\\Wishlist\\SelectedVariantSku")
+    child_sku: String! @deprecated(reason: "Use `ConfigurableWishlistItem.configured_variant.sku` instead.") @doc(description: "The SKU of the simple product corresponding to a set of selected configurable options.") @resolver(class: "\\Magento\\ConfigurableProductGraphQl\\Model\\Wishlist\\ChildSku")
     configurable_options: [SelectedConfigurableOption!] @resolver(class: "\\Magento\\ConfigurableProductGraphQl\\Model\\Wishlist\\ConfigurableOptions") @doc(description: "An array of selected configurable options.")
+    configured_variant: ProductInterface @doc(description: "Product details of the selected variant. The value is null if some options are not configured.") @resolver(class: "\\Magento\\ConfigurableProductGraphQl\\Model\\Wishlist\\ConfiguredVariant")
 }
 
 type ConfigurableProductOptionsSelection @doc(description: "Contains metadata corresponding to the selected configurable options.") {

app/code/Magento/WishlistGraphQl/Model/WishlistItem/DataProvider/CustomizableOption.php

@@ -7,7 +7,6 @@
 
 namespace Magento\WishlistGraphQl\Model\WishlistItem\DataProvider;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Query\Uid;
 use Magento\Wishlist\Model\Item as WishlistItem;
@@ -27,20 +26,21 @@ class CustomizableOption
      */
     private $customizableOptionValue;
 
-    /** @var Uid */
+    /**
+     * @var Uid
+     */
     private $uidEncoder;
 
     /**
      * @param CustomizableOptionValueInterface $customOptionValueDataProvider
-     * @param Uid|null $uidEncoder
+     * @param Uid $uidEncoder
      */
     public function __construct(
         CustomizableOptionValueInterface $customOptionValueDataProvider,
-        Uid $uidEncoder = null
+        Uid $uidEncoder
     ) {
         $this->customizableOptionValue = $customOptionValueDataProvider;
-        $this->uidEncoder = $uidEncoder ?: ObjectManager::getInstance()
-            ->get(Uid::class);
+        $this->uidEncoder = $uidEncoder;
     }
 
     /**

app/code/Magento/WishlistGraphQl/Model/WishlistItem/DataProvider/CustomizableOptionValue/Dropdown.php

@@ -9,7 +9,6 @@
 
 use Magento\Catalog\Model\Product\Option;
 use Magento\Catalog\Model\Product\Option\Type\Select as SelectOptionType;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Query\Uid;
 use Magento\Wishlist\Model\Item as WishlistItem;
 use Magento\Wishlist\Model\Item\Option as SelectedOption;
@@ -30,20 +29,21 @@ class Dropdown implements CustomizableOptionValueInterface
      */
     private $priceUnitLabel;
 
-    /** @var Uid */
+    /**
+     * @var Uid
+     */
     private $uidEncoder;
 
     /**
      * @param PriceUnitLabel $priceUnitLabel
-     * @param Uid|null $uidEncoder
+     * @param Uid $uidEncoder
      */
     public function __construct(
         PriceUnitLabel $priceUnitLabel,
-        Uid $uidEncoder = null
+        Uid $uidEncoder
     ) {
         $this->priceUnitLabel = $priceUnitLabel;
-        $this->uidEncoder = $uidEncoder ?: ObjectManager::getInstance()
-            ->get(Uid::class);
+        $this->uidEncoder = $uidEncoder;
     }
 
     /**

app/code/Magento/WishlistGraphQl/Model/WishlistItem/DataProvider/CustomizableOptionValue/Multiple.php

@@ -8,7 +8,6 @@
 namespace Magento\WishlistGraphQl\Model\WishlistItem\DataProvider\CustomizableOptionValue;
 
 use Magento\Catalog\Model\Product\Option;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Query\Uid;
 use Magento\Wishlist\Model\Item as WishlistItem;
 use Magento\Wishlist\Model\Item\Option as SelectedOption;
@@ -29,20 +28,21 @@ class Multiple implements CustomizableOptionValueInterface
      */
     private $priceUnitLabel;
 
-    /** @var Uid */
+    /**
+     * @var Uid
+     */
     private $uidEncoder;
 
     /**
      * @param PriceUnitLabel $priceUnitLabel
-     * @param Uid|null $uidEncoder
+     * @param Uid $uidEncoder
      */
     public function __construct(
         PriceUnitLabel $priceUnitLabel,
-        Uid $uidEncoder = null
+        Uid $uidEncoder
     ) {
         $this->priceUnitLabel = $priceUnitLabel;
-        $this->uidEncoder = $uidEncoder ?: ObjectManager::getInstance()
-            ->get(Uid::class);
+        $this->uidEncoder = $uidEncoder;
     }
 
     /**

app/code/Magento/WishlistGraphQl/Model/WishlistItem/DataProvider/CustomizableOptionValue/Text.php

@@ -9,7 +9,6 @@
 
 use Magento\Catalog\Model\Product\Option;
 use Magento\Catalog\Model\Product\Option\Type\Text as TextOptionType;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Query\Uid;
 use Magento\Wishlist\Model\Item as WishlistItem;
 use Magento\Wishlist\Model\Item\Option as SelectedOption;
@@ -30,20 +29,21 @@ class Text implements CustomizableOptionValueInterface
      */
     private $priceUnitLabel;
 
-    /** @var Uid */
+    /**
+     * @var Uid
+     */
     private $uidEncoder;
 
     /**
      * @param PriceUnitLabel $priceUnitLabel
-     * @param Uid|null $uidEncoder
+     * @param Uid $uidEncoder
      */
     public function __construct(
         PriceUnitLabel $priceUnitLabel,
-        Uid $uidEncoder = null
+        Uid $uidEncoder
     ) {
         $this->priceUnitLabel = $priceUnitLabel;
-        $this->uidEncoder = $uidEncoder ?: ObjectManager::getInstance()
-            ->get(Uid::class);
+        $this->uidEncoder = $uidEncoder;
     }
 
     /**