ACP2E-1620: [QUANS] Scheduled import successfully runs despite errors in system.log file

 - Fixed the CR comments.

Author: devarul

app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php

@@ -11,6 +11,7 @@
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 use Magento\ImportExport\Model\History as ModelHistory;
+use Magento\Framework\Escaper;
 use Magento\Framework\App\ObjectManager;
 use Magento\ImportExport\Model\Import\RenderErrorMessages;
 use Magento\ImportExport\Model\Report\ReportProcessorInterface;
@@ -42,6 +43,11 @@ abstract class ImportResult extends Import
      */
     protected Report $reportHelper;
 
+    /**
+     * @var Escaper|null
+     */
+    protected $escaper;
+
     /**
      * @var RenderErrorMessages
      */
@@ -52,19 +58,23 @@ abstract class ImportResult extends Import
      * @param ReportProcessorInterface $reportProcessor
      * @param ModelHistory $historyModel
      * @param Report $reportHelper
+     * @param Escaper|null $escaper
      * @param RenderErrorMessages|null $renderErrorMessages
      */
     public function __construct(
         Context $context,
         ReportProcessorInterface $reportProcessor,
         ModelHistory $historyModel,
         Report $reportHelper,
+        Escaper $escaper = null,
         ?RenderErrorMessages $renderErrorMessages = null
     ) {
         parent::__construct($context);
         $this->reportProcessor = $reportProcessor;
         $this->historyModel = $historyModel;
         $this->reportHelper = $reportHelper;
+        $this->escaper = $escaper
+            ?? ObjectManager::getInstance()->get(Escaper::class);
         $this->renderErrorMessages = $renderErrorMessages ??
             ObjectManager::getInstance()->get(RenderErrorMessages::class);
     }

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

@@ -75,37 +75,35 @@ public function __construct(
      * Add Error Messages for Import
      *
      * @param ProcessingErrorAggregatorInterface $errorAggregator
-     * @return string|void
+     * @return string
      */
     public function renderMessages(
         ProcessingErrorAggregatorInterface $errorAggregator
-    ) {
-        if ($errorAggregator->getErrorsCount()) {
-            $message = '';
-            $counter = 0;
-            $escapedMessages = [];
-            foreach ($this->getErrorMessages($errorAggregator) as $error) {
-                $escapedMessages[] = (++$counter) . '. ' . $this->escaper->escapeHtml($error);
-                if ($counter >= ImportResult::LIMIT_ERRORS_MESSAGE) {
-                    break;
-                }
+    ): string {
+        $message = '';
+        $counter = 0;
+        $escapedMessages = [];
+        foreach ($this->getErrorMessages($errorAggregator) as $error) {
+            $escapedMessages[] = (++$counter) . '. ' . $this->escaper->escapeHtml($error);
+            if ($counter >= ImportResult::LIMIT_ERRORS_MESSAGE) {
+                break;
             }
-            if ($errorAggregator->hasFatalExceptions()) {
-                foreach ($this->getSystemExceptions($errorAggregator) as $error) {
-                    $escapedMessages[] = $this->escaper->escapeHtml($error->getErrorMessage())
-                        . ' <a href="#" onclick="$(this).next().show();$(this).hide();return false;">'
-                        . __('Show more') . '</a><div style="display:none;">' . __('Additional data') . ': '
-                        . $this->escaper->escapeHtml($error->getErrorDescription()) . '</div>';
-                }
+        }
+        if ($errorAggregator->hasFatalExceptions()) {
+            foreach ($this->getSystemExceptions($errorAggregator) as $error) {
+                $escapedMessages[] = $this->escaper->escapeHtml($error->getErrorMessage())
+                    . ' <a href="#" onclick="$(this).next().show();$(this).hide();return false;">'
+                    . __('Show more') . '</a><div style="display:none;">' . __('Additional data') . ': '
+                    . $this->escaper->escapeHtml($error->getErrorDescription()) . '</div>';
             }
-            $message .= implode('<br>', $escapedMessages);
-            return '<strong>' . __('Following Error(s) has been occurred during importing process:') . '</strong><br>'
-                . '<div class="import-error-wrapper">' . __('Only the first 100 errors are shown. ')
-                . '<a href="'
-                . $this->createDownloadUrlImportHistoryFile($this->createErrorReport($errorAggregator))
-                . '">' . __('Download full report') . '</a><br>'
-                . '<div class="import-error-list">' . $message . '</div></div>';
         }
+        $message .= implode('<br>', $escapedMessages);
+        return '<strong>' . __('Following Error(s) has been occurred during importing process:') . '</strong><br>'
+            . '<div class="import-error-wrapper">' . __('Only the first 100 errors are shown. ')
+            . '<a href="'
+            . $this->createDownloadUrlImportHistoryFile($this->createErrorReport($errorAggregator))
+            . '">' . __('Download full report') . '</a><br>'
+            . '<div class="import-error-list">' . $message . '</div></div>';
     }
 
     /**