MC-18685: Remove custom layout updates from admin

Author: Oleksandr Gorkun

app/code/Magento/SalesSampleData/Model/Order/Converter.php

@@ -197,6 +197,9 @@ protected function getProductAttributes($configurableAttributes)
             }
             $options = $this->productConverter->getAttributeOptions($attribute->getAttributeCode());
             $attributeOption = $options->getItemByColumnValue('value', $value);
+            if (!$attributeOption) {
+                throw new \RuntimeException('Required option "' .$value .'" for ' .$attributeCode .' does not exist');
+            }
             $attributeId = $attributeOption->getDataByKey('attribute_id');
             $attributesData[$attributeId] = $attributeOption->getDataByKey('option_id');
         }

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

@@ -128,7 +128,7 @@ private function getOptionSwatchVisual(array $attributeData)
         foreach ($attributeData['option'] as $optionKey => $optionValue) {
             if (substr($optionValue, 0, 1) == '#' && strlen($optionValue) == 7) {
                 $optionSwatch['value'][$optionKey] = $optionValue;
-            } else if ($this->colorMap[$optionValue]) {
+            } else if (!empty($this->colorMap[$optionValue])) {
                 $optionSwatch['value'][$optionKey] = $this->colorMap[$optionValue];
             } else {
                 $optionSwatch['value'][$optionKey] = $this->colorMap['White'];