Merge remote-tracking branch 'origin/AC-11588v2' into spartans_pr_15042024

Author: glo60612

app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php

@@ -83,7 +83,9 @@ private function processValidationResult($validationResult, $resultBlock)
 
         if ($import->getProcessedRowsCount()) {
             if ($validationResult) {
-                $this->addMessageForValidResult($resultBlock);
+                $totalError = $errorAggregator->getErrorsCount();
+                $totalRows = $import->getProcessedRowsCount();
+                $this->addMessageForValidResult($resultBlock, $totalError, $totalRows);
             } else {
                 $resultBlock->addError(
                     __('Data validation failed. Please fix the following errors and upload the file again.')
@@ -154,12 +156,14 @@ private function addMessageToSkipErrors(Result $resultBlock)
      * 2. Add message for case when imported data was checked and result is valid, but import is not allowed.
      *
      * @param Result $resultBlock
+     * @param Import $totalError
+     * @param Import $totalRows
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function addMessageForValidResult(Result $resultBlock)
+    private function addMessageForValidResult(Result $resultBlock, $totalError, $totalRows)
     {
-        if ($this->getImport()->isImportAllowed()) {
+        if ($this->getImport()->isImportAllowed() && $totalRows > $totalError) {
             $resultBlock->addSuccess(__('File is valid! To start import process press "Import" button'), true);
         } else {
             $resultBlock->addError(__('The file is valid, but we can\'t import it for some reason.'));