#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

@@ -167,7 +167,7 @@ protected function convertSwatchToDropdown(Attribute $attribute)
                 $additionalData = $this->serializer->unserialize($additionalData);
                 if (is_array($additionalData) && isset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY])) {
                     if ($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY] == Swatch::SWATCH_INPUT_TYPE_VISUAL) {
-                        $this->cleanEavAttributeOptionSwatchValues($attribute);
+                        $this->cleanEavAttributeOptionSwatchValues($attribute->getOption());
                     }
                     unset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY]);
                     $attribute->setData('additional_data', $this->serializer->serialize($additionalData));
@@ -176,22 +176,6 @@ protected function convertSwatchToDropdown(Attribute $attribute)
         }
     }
 
-    /**
-     * Clean swatch option values after switching to the dropdown type.
-     *
-     * @param Attribute $attribute
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    private function cleanEavAttributeOptionSwatchValues(Attribute $attribute)
-    {
-        if (count($attribute->getOption())) {
-            $options = $attribute->getOption();
-            $optionsIDs = array_keys($options['value']);
-
-            $this->swatchResource->clearSwatchOptionByOptionId($optionsIDs);
-        }
-    }
-
     /**
      * Creates array which link new option ids
      *
@@ -263,7 +247,7 @@ protected function saveSwatchParams(Attribute $attribute)
     {
         if ($this->swatchHelper->isVisualSwatch($attribute)) {
             $this->processVisualSwatch($attribute);
-            $this->cleanTextSwatchValuesAfterSwitch($attribute);
+            $this->cleanTextSwatchValuesAfterSwitch($attribute->getOptiontext());
         } elseif ($this->swatchHelper->isTextSwatch($attribute)) {
             $this->processTextualSwatch($attribute);
         }
@@ -296,23 +280,34 @@ protected function processVisualSwatch(Attribute $attribute)
         }
     }
 
+
     /**
-     * Cleaning the text type of swatch option values after switching.
+     * Clean swatch option values after switching to the dropdown type.
      *
-     * @param $attribute
+     * @param array $attributeOptions
+     * @param null  $swatchType
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function cleanTextSwatchValuesAfterSwitch( Attribute $attribute)
+    private function cleanEavAttributeOptionSwatchValues($attributeOptions, $swatchType = null)
     {
-        $optionsIDs = [];
-        if (count($attribute->getOptiontext())) {
-            $options = $attribute->getOptiontext();
-            if (count($options) && isset($options['value'])) {
-                $optionsIDs = array_keys($options['value']);
-                $this->swatchResource->clearSwatchOptionTextByOptionId($optionsIDs, Swatch::SWATCH_TYPE_TEXTUAL);
-            }
+        if (count($attributeOptions) && isset($attributeOptions['value'])) {
+            $optionsIDs = array_keys($attributeOptions['value']);
+
+            $this->swatchResource->clearSwatchOptionByOptionIdAndType($optionsIDs, $swatchType);
         }
     }
 
+    /**
+     * Cleaning the text type of swatch option values after switching.
+     *
+     * @param array $attributeOptions
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function cleanTextSwatchValuesAfterSwitch($attributeOptions)
+    {
+        $this->cleanEavAttributeOptionSwatchValues($attributeOptions, Swatch::SWATCH_TYPE_TEXTUAL);
+    }
+
     /**
      * @param string $value
      * @return int

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

@@ -42,28 +42,19 @@ public function saveDefaultSwatchOption($id, $defaultValue)
      * Cleaned swatch option values when switching to dropdown input type
      *
      * @param $optionIDs
+     * @param $type
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function clearSwatchOptionByOptionId($optionIDs)
+    public function clearSwatchOptionByOptionIdAndType($optionIDs, $type = null)
     {
         if (count($optionIDs)) {
             foreach ($optionIDs as $optionId) {
                 $where = ['option_id' => $optionId];
+                if ($type !== null) {
+                    $where['type = ?'] = $type;
+                }
                 $this->getConnection()->delete($this->getMainTable(), $where);
             }
         }
     }
-
-    /**
-     * @param $optionIDs
-     * @param $type
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    public function clearSwatchOptionTextByOptionId($optionIDs, $type)
-    {
-        foreach ($optionIDs as $optionId) {
-            $where = ['option_id = ?' => $optionId, 'type = ?' => $type];
-            $this->getConnection()->delete($this->getMainTable(), $where);
-        }
-    }
 }