Merge branch 'MAGNIMEX-13-Import-History-Fix-Filename' into 'master'

Magnimex 13 import history fix filename

See merge request !150

Author: kalashnikau-uladzimir

app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php

@@ -12,20 +12,6 @@
  */
 class Download extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
 {
-    /**
-     * @param \Magento\Backend\Block\Context $context
-     * @param \Magento\Backend\Model\Url $urlModel
-     * @param array $data
-     */
-    public function __construct(
-        \Magento\Backend\Block\Context $context,
-        \Magento\Backend\Model\Url $urlModel,
-        array $data = []
-    ) {
-        $this->urlModel = $urlModel;
-        parent::__construct($context, $data);
-    }
-
     /**
      * Renders grid column
      *

app/code/Magento/ImportExport/Block/Adminhtml/History.php

@@ -12,25 +12,6 @@
  */
 class History extends \Magento\Backend\Block\Widget\Grid\Container
 {
-    /**
-     * @var \Magento\User\Model\Resource\User
-     */
-    protected $_resourceModel;
-
-    /**
-     * @param \Magento\Backend\Block\Widget\Context $context
-     * @param \Magento\ImportExport\Model\Resource\History $resourceModel
-     * @param array $data
-     */
-    public function __construct(
-        \Magento\Backend\Block\Widget\Context $context,
-        \Magento\ImportExport\Model\Resource\History $resourceModel,
-        array $data = []
-    ) {
-        parent::__construct($context, $data);
-        $this->_resourceModel = $resourceModel;
-    }
-
     /**
      * Class constructor
      *

app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php

@@ -17,30 +17,18 @@ class Download extends \Magento\ImportExport\Controller\Adminhtml\History
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\Backup\Factory $backupFactory
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @param \Magento\Backup\Model\BackupFactory $backupModelFactory
-     * @param \Magento\Framework\App\MaintenanceMode $maintenanceMode
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\Backup\Factory $backupFactory,
         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
-        \Magento\Backup\Model\BackupFactory $backupModelFactory,
-        \Magento\Framework\App\MaintenanceMode $maintenanceMode,
         \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
     ) {
         parent::__construct(
             $context
         );
-        $this->_coreRegistry = $coreRegistry;
-        $this->_backupFactory = $backupFactory;
-        $this->_fileFactory = $fileFactory;
-        $this->_backupModelFactory = $backupModelFactory;
-        $this->maintenanceMode = $maintenanceMode;
+        $this->fileFactory = $fileFactory;
         $this->resultRawFactory = $resultRawFactory;
     }
 
@@ -63,7 +51,7 @@ public function execute()
             return $resultRedirect;
         }
 
-        $this->_fileFactory->create(
+        $this->fileFactory->create(
             $fileName,
             null,
             DirectoryList::VAR_DIR,

app/code/Magento/ImportExport/Model/Import.php

@@ -320,7 +320,7 @@ public function getOperationResultMessages($validationResult)
      */
     public static function getAttributeType(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute)
     {
-        if ($attribute->usesSource() && in_array($attribute->getFrontendInput(), array('select', 'multiselect'))) {
+        if ($attribute->usesSource() && in_array($attribute->getFrontendInput(), ['select', 'multiselect'])) {
             return $attribute->getFrontendInput() == 'multiselect' ? 'multiselect' : 'select';
         } elseif ($attribute->isStatic()) {
             return $attribute->getFrontendInput() == 'date' ? 'datetime' : 'varchar';
@@ -547,7 +547,7 @@ public function uploadSource()
             }
         }
         $this->_removeBom($sourceFile);
-        $this->createHistoryReport($entity, $extension, $sourceFileRelative);
+        $this->createHistoryReport($entity, $extension, $sourceFileRelative, $result);
         // trying to create source adapter for file and catch possible exception to be convinced in its adequacy
         try {
             $this->_getSourceAdapter($sourceFile);
@@ -697,13 +697,18 @@ public function isReportEntityType($entity = null)
      * @param string $entity
      * @param string $extension
      * @param string $sourceFileRelative
+     * @param array $result
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function createHistoryReport($entity, $extension, $sourceFileRelative)
+    protected function createHistoryReport($entity, $extension, $sourceFileRelative, $result)
     {
         if ($this->isReportEntityType($entity)) {
-            $copyName = $entity . '_' . $this->localeDate->gmtTimestamp() . '.' . $extension;
+            $fileName = $entity . $extension;
+            if (isset($result['name'])) {
+                $fileName = $result['name'];
+            }
+            $copyName = $this->localeDate->gmtTimestamp() . '_' . $fileName;
             $copyFile = self::IMPORT_HISTORY_DIR . $copyName;
             try {
                 $this->_varDirectory->copyFile($sourceFileRelative, $copyFile);