Merge remote-tracking branch 'origin/AC-10720' into GL_PR_Arrows_Jan_19_2024

Author: Atul-glo35265

app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js

@@ -74,6 +74,16 @@ define([
                         $.mage.__('We could not detect a size.') :
                         byteConvert(currentFile.size);
 
+                    // check if file is allowed to upload and resize
+                    allowedResize = $.inArray(currentFile.extension, allowedExt) !== -1;
+
+                    if (!allowedResize)  {
+                        fileUploader.aggregateError(currentFile.name,
+                            $.mage.__('Disallowed file type.'));
+                        fileUploader.onLoadingStop();
+                        return false;
+                    }
+
                     fileId = Math.random().toString(33).substr(2, 18);
 
                     tmpl = progressTmpl({
@@ -91,9 +101,6 @@ define([
                         tempFileId:  fileId
                     };
 
-                    // check if resize allowed for file extension
-                    allowedResize = $.inArray(currentFile.extension, allowedExt) !== -1;
-
                     $(tmpl).appendTo(self.element);
                     return modifiedFile;
                 },

app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js

@@ -68,7 +68,6 @@ define([
             if (fileInput !== undefined) {
                 let targetElement = $(fileInput).closest('.file-uploader-area')[0],
                     dropTargetElement = $(fileInput).closest(this.dropZone)[0],
-                    fileObj = [],
                     formKey = window.FORM_KEY !== undefined ? window.FORM_KEY : $.cookie('form_key'),
                     fileInputName = this.fileInputName,
                     arrayFromObj = Array.from,
@@ -105,12 +104,8 @@ define([
                         }
 
                         if (!allowed.passed)  {
-                            fileObj.push(currentFile);
                             this.aggregateError(file.name, allowed.message);
-
-                            if (this.aggregatedErrors.length === fileObj.length) {
-                                this.uploaderConfig.stop();
-                            }
+                            this.uploaderConfig.stop();
                             return false;
                         }