#12695: Unable to change attribute type from swatch to dropdown

- fixes after code review.

Author: eugene-shab

app/code/Magento/Swatches/Model/Plugin/EavAttribute.php

@@ -22,7 +22,7 @@ class EavAttribute
     /**
      * @var SwatchResource
      */
-    protected $swatchResource;
+    private $swatchResource;
 
     /**
      * Base option title used for string operations to detect is option already exists or new
@@ -70,19 +70,20 @@ class EavAttribute
      * @param \Magento\Swatches\Model\SwatchFactory $swatchFactory
      * @param \Magento\Swatches\Helper\Data $swatchHelper
      * @param Json|null $serializer
+     * @param SwatchResource|null $swatchResource
      */
     public function __construct(
         \Magento\Swatches\Model\ResourceModel\Swatch\CollectionFactory $collectionFactory,
         \Magento\Swatches\Model\SwatchFactory $swatchFactory,
-        SwatchResource $swatchResource,
         \Magento\Swatches\Helper\Data $swatchHelper,
-        Json $serializer = null
+        Json $serializer = null,
+        SwatchResource $swatchResource = null
     ) {
         $this->swatchCollectionFactory = $collectionFactory;
         $this->swatchFactory = $swatchFactory;
         $this->swatchHelper = $swatchHelper;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->create(Json::class);
-        $this->swatchResource = $swatchResource;
+        $this->swatchResource = $swatchResource ?: ObjectManager::getInstance()->create(SwatchResource::class);
     }
 
     /**
@@ -183,12 +184,12 @@ protected function convertSwatchToDropdown(Attribute $attribute)
      */
     private function cleanEavAttributeOptionSwatchValues(Attribute $attribute)
     {
-        $optionsIDs = [];
         if (count($attribute->getOption())) {
             $options = $attribute->getOption();
-            foreach ($options['value'] as $id => $item) {
-                $optionsIDs[] = $id;
-            }
+//            foreach ($options['value'] as $id => $item) {
+//                $optionsIDs[] = $id;
+//            }
+            $optionsIDs = array_keys($options['value']);
 
             $this->swatchResource->clearSwatchOptionByOptionId($optionsIDs);
         }
@@ -309,12 +310,8 @@ private function cleanTextSwatchValuesAfterSwitch( Attribute $attribute)
         if (count($attribute->getOptiontext())) {
             $options = $attribute->getOptiontext();
             if (count($options)) {
-                foreach ($options['value'] as $id => $item) {
-                    $optionsIDs[] = $id;
-                }
-
-                $type = Swatch::SWATCH_TYPE_TEXTUAL;
-                $this->swatchResource->clearSwatchOptionTextByOptionId($optionsIDs, $type);
+                $optionsIDs[] = array_keys($options['value']);
+                $this->swatchResource->clearSwatchOptionTextByOptionId($optionsIDs, Swatch::SWATCH_TYPE_TEXTUAL);
             }
         }
     }

app/code/Magento/Swatches/Model/ResourceModel/Swatch.php

@@ -54,6 +54,11 @@ public function clearSwatchOptionByOptionId($optionIDs)
         }
     }
 
+    /**
+     * @param $optionIDs
+     * @param $type
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function clearSwatchOptionTextByOptionId($optionIDs, $type)
     {
         foreach ($optionIDs as $optionId) {

app/code/Magento/Swatches/Model/SwatchAttributeCodes.php

@@ -67,7 +67,7 @@ public function __construct(
      *
      * @return array
      */
-        public function getCodes()
+    public function getCodes()
     {
         if ($this->swatchAttributeCodes === null) {
             $swatchAttributeCodesCache = $this->cache->load($this->cacheKey);

app/code/Magento/Swatches/Model/SwatchAttributesProvider.php

@@ -8,6 +8,8 @@
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Catalog\Model\Product;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
+use \Magento\Swatches\Helper\Data as SwatchesHelper;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Provide list of swatch attributes for product.
@@ -17,7 +19,7 @@ class SwatchAttributesProvider
     /**
      * @var \Magento\Swatches\Helper\Data
      */
-    protected $swatchHelper;
+    protected $swatchesHelper;
     /**
      * @var Configurable
      */
@@ -35,17 +37,20 @@ class SwatchAttributesProvider
     private $attributesPerProduct;
 
     /**
-     * @param Configurable $typeConfigurable
+     * SwatchAttributesProvider constructor.
+     *
+     * @param Configurable         $typeConfigurable
      * @param SwatchAttributeCodes $swatchAttributeCodes
+     * @param SwatchesHelper|null    $swatchHelper
      */
     public function __construct(
         Configurable $typeConfigurable,
         SwatchAttributeCodes $swatchAttributeCodes,
-        \Magento\Swatches\Helper\Data\Proxy $swatchHelper
+        SwatchesHelper $swatchHelper = null
     ) {
         $this->typeConfigurable = $typeConfigurable;
         $this->swatchAttributeCodes = $swatchAttributeCodes;
-        $this->swatchHelper = $swatchHelper;
+        $this->swatchesHelper = $swatchHelper ?: ObjectManager::getInstance()->create(SwatchesHelper::class);
     }
 
     /**
@@ -66,17 +71,27 @@ public function provide(Product $product)
 
             $swatchAttributes = [];
             foreach ($configurableAttributes as $configurableAttribute) {
-                // Due to $this->swatchAttributeCodes->getCodes() - return swatch data for every attribute.
-                if ($this->swatchHelper->isSwatchAttribute($configurableAttribute->getProductAttribute())) {
+                if ($this->getIsSwatchAttribute($configurableAttribute->getProductAttribute())) {
                     if (array_key_exists($configurableAttribute->getAttributeId(), $swatchAttributeCodeMap)) {
                         $swatchAttributes[$configurableAttribute->getAttributeId()]
                             = $configurableAttribute->getProductAttribute();
                     }
-
                 }
             }
             $this->attributesPerProduct[$product->getId()] = $swatchAttributes;
         }
         return $this->attributesPerProduct[$product->getId()];
     }
+
+    /**
+     * This method introduced only for the case when customer already has converted attribute.
+     *
+     * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $productAttribute
+     * @return bool
+     * @deprecated
+     */
+    private function getIsSwatchAttribute($productAttribute)
+    {
+        return $this->swatchesHelper->isSwatchAttribute($productAttribute);
+    }
 }

app/code/Magento/Swatches/etc/di.xml

@@ -81,4 +81,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="\Magento\Swatches\Model\SwatchAttributesProvider">
+        <arguments>
+            <argument name="swatchHelper" xsi:type="object">\Magento\Swatches\Helper\Data\Proxy</argument>
+        </arguments>
+    </type>
 </config>