PWA-1326: Implement the schema changes for Configurable Options Selection

- refactoring swatches

Author: cpartica

app/code/Magento/ConfigurableProductGraphQl/Model/Formatter/OptionValue.php

@@ -11,7 +11,6 @@
 use Magento\CatalogInventory\Model\StockRegistry;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 use Magento\ConfigurableProductGraphQl\Model\Options\SelectionUidFormatter;
-use Magento\SwatchesGraphQl\Model\Resolver\Product\Options\DataProvider\SwatchDataProvider;
 
 /**
  * Formatter for configurable product option values
@@ -23,28 +22,20 @@ class OptionValue
      */
     private $selectionUidFormatter;
 
-    /**
-     * @var SwatchDataProvider
-     */
-    private $swatchDataProvider;
-
     /**
      * @var StockRegistry
      */
     private $stockRegistry;
 
     /**
      * @param SelectionUidFormatter $selectionUidFormatter
-     * @param SwatchDataProvider $swatchDataProvider
      * @param StockRegistry $stockRegistry
      */
     public function __construct(
         SelectionUidFormatter $selectionUidFormatter,
-        SwatchDataProvider $swatchDataProvider,
         StockRegistry $stockRegistry
     ) {
         $this->selectionUidFormatter = $selectionUidFormatter;
-        $this->swatchDataProvider = $swatchDataProvider;
         $this->stockRegistry = $stockRegistry;
     }
 
@@ -69,7 +60,7 @@ public function format(array $optionValue, Attribute $attribute, array $optionId
             'is_available' => $this->getIsAvailable($optionIds[$valueIndex] ?? []),
             'is_use_default' => (bool)$attribute->getIsUseDefault(),
             'label' => $optionValue['label'],
-            'swatch' => $this->swatchDataProvider->getData($optionValue['value_index'])
+            'value_index' => $optionValue['value_index']
         ];
     }
 

app/code/Magento/ConfigurableProductGraphQl/Model/Options/DataProvider/Variant.php

@@ -10,7 +10,6 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\CatalogInventory\Model\ResourceModel\Stock\StatusFactory;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
 
 /**
@@ -44,8 +43,8 @@ public function __construct(
      * Load available child products by parent
      *
      * @param ProductInterface $product
-     * @return DataObject[]
-     * @throws LocalizedException
+     * @return ProductInterface[]
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getSalableVariantsByParent(ProductInterface $product): array
     {

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

@@ -49,5 +49,5 @@ type ColorSwatchData implements SwatchDataInterface {
 }
 
 type ConfigurableProductOptionValue {
-    swatch: SwatchDataInterface
+    swatch: SwatchDataInterface @resolver(class: "Magento\\SwatchesGraphQl\\Model\\Resolver\\Product\\Options\\SwatchData")
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Swatches/ProductSwatchDataTest.php

@@ -84,19 +84,29 @@ public function testVisualSwatchDataValues()
         $color = '#000000';
         $query = <<<QUERY
 {
-  products(filter: {sku: {eq: "$productSku"}}) {
+  products(filter: { sku: { eq: "$productSku" } }) {
     items {
-        ... on ConfigurableProduct{
-      configurable_options{
+      ... on ConfigurableProduct {
+        configurable_options {
           values {
-            swatch_data{
+            swatch_data {
               value
               ... on ImageSwatchData {
                 thumbnail
               }
             }
           }
         }
+        configurable_product_options_selection {
+          configurable_options {
+            values {
+              label
+              swatch {
+                value
+              }
+            }
+          }
+        }
       }
     }
   }
@@ -123,5 +133,15 @@ public function testVisualSwatchDataValues()
             $option['values'][1]['swatch_data']['thumbnail'],
             $this->swatchMediaHelper->getSwatchAttributeImage(Swatch::SWATCH_THUMBNAIL_NAME, $imageName)
         );
+
+        $configurableProductOptionsSelection =
+            $product['configurable_product_options_selection']['configurable_options'][0];
+
+        $this->assertArrayHasKey('values', $configurableProductOptionsSelection);
+        $this->assertEquals($color, $configurableProductOptionsSelection['values'][0]['swatch']['value']);
+        $this->assertStringContainsString(
+            $configurableProductOptionsSelection['values'][1]['swatch']['value'],
+            $this->swatchMediaHelper->getSwatchAttributeImage(Swatch::SWATCH_IMAGE_NAME, $imageName)
+        );
     }
 }