MC-18685: Remove custom layout updates from admin

Author: Oleksandr Gorkun

app/code/Magento/CatalogSampleData/Model/Attribute.php

@@ -108,7 +108,7 @@ public function install(array $fixtures)
             foreach ($rows as $row) {
                 $data = [];
                 foreach ($row as $key => $value) {
-                    $data[$header[$key]] = $value;
+                    $data[$header[$key]] = trim($value);
                 }
                 $data['attribute_set'] = explode("\n", $data['attribute_set']);
 

app/code/Magento/ConfigurableSampleData/Model/Product.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\ConfigurableSampleData\Model;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\ImportExport\Model\Import;
@@ -16,6 +15,11 @@
  */
 class Product
 {
+    /**
+     * @var Import
+     */
+    private $importModel;
+
     /**
      * @var \Magento\ImportExport\Model\Import\Source\CsvFactory
      */
@@ -36,11 +40,6 @@ class Product
      */
     private $componentRegistrar;
 
-    /**
-     * @var \Magento\ImportExport\Model\ImportFactory
-     */
-    private $importFactory;
-
     /**
      * @var \Magento\Eav\Model\Config
      */
@@ -53,37 +52,31 @@ class Product
      * @param \Magento\Indexer\Model\Indexer\CollectionFactory $indexerCollectionFactory
      * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
      * @param \Magento\Framework\Component\ComponentRegistrar $componentRegistrar
-     * @param \Magento\ImportExport\Model\ImportFactory|null $importFactory
      */
     public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         Import $importModel,
         \Magento\ImportExport\Model\Import\Source\CsvFactory $csvSourceFactory,
         \Magento\Indexer\Model\Indexer\CollectionFactory $indexerCollectionFactory,
         \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory,
-        \Magento\Framework\Component\ComponentRegistrar $componentRegistrar,
-        ?\Magento\ImportExport\Model\ImportFactory $importFactory = null
+        \Magento\Framework\Component\ComponentRegistrar $componentRegistrar
     ) {
         $this->eavConfig = $eavConfig;
+        $this->importModel = $importModel;
         $this->csvSourceFactory = $csvSourceFactory;
         $this->indexerCollectionFactory = $indexerCollectionFactory;
         $this->readFactory = $readFactory;
         $this->componentRegistrar = $componentRegistrar;
-        $this->importFactory = $importFactory
-            ?? ObjectManager::getInstance()->get(\Magento\ImportExport\Model\ImportFactory::class);
     }
 
     /**
      * @inheritdoc
      */
     public function install()
     {
-        \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType::$attributeCodeToId = [];
-        \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType::$commonAttributesCache = [];
-        \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType::$invAttributesCache = [];
         $this->eavConfig->clear();
         /** @var Import $importModel */
-        $importModel = $this->importFactory->create();
+        $importModel = $this->importModel;
         $importModel->setData(
             [
                 'entity' => 'catalog_product',