ENGCOM-845: [Backport 2.2] Solve problem saving empty swatches in admin #13717

Author: Stanislav Idolov

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php

@@ -110,6 +110,11 @@ public function execute()
                 $options
             );
             $valueOptions = (isset($options['value']) && is_array($options['value'])) ? $options['value'] : [];
+            foreach (array_keys($valueOptions) as $key) {
+                if (!empty($options['delete'][$key])) {
+                    unset($valueOptions[$key]);
+                }
+            }
             $this->checkEmptyOption($response, $valueOptions);
         }
 

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php

@@ -249,6 +249,20 @@ public function provideUniqueData()
                     ]
                 ], false
             ],
+            'empty and deleted' => [
+                [
+                    'value' => [
+                        "option_0" => [1, 0],
+                        "option_1" => [2, 0],
+                        "option_2" => ["", ""],
+                    ],
+                    'delete' => [
+                        "option_0" => "",
+                        "option_1" => "",
+                        "option_2" => "1",
+                    ]
+                ], false
+            ],
         ];
     }
 
@@ -321,7 +335,34 @@ public function provideEmptyOption()
                 (object) [
                     'error' => false,
                 ]
-            ]
+            ],
+            'empty admin scope options and deleted' => [
+                [
+                    'value' => [
+                        "option_0" => [''],
+                    ],
+                    'delete' => [
+                        'option_0' => '1',
+                    ],
+                ],
+                (object) [
+                    'error' => false,
+                ],
+            ],
+            'empty admin scope options and not deleted' => [
+                [
+                    'value' => [
+                        "option_0" => [''],
+                    ],
+                    'delete' => [
+                        'option_0' => '0',
+                    ],
+                ],
+                (object) [
+                    'error' => true,
+                    'message' => 'The value of Admin scope can\'t be empty.',
+                ],
+            ],
         ];
     }
 }