AC-10720::Migration from outdated jquery/fileUpload library - Resolve Static Errors and Fix QA Issue for #AC-10919

AC-10919 :: Fix QA Issue

AC-10919 :: Fix QA Issue

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/Catalog/view/adminhtml/web/catalog/base-image-uploader.js

@@ -3,6 +3,8 @@
  * See COPYING.txt for license details.
  */
 
+/* eslint-disable no-undef */
+
 define([
     'jquery',
     'mage/template',
@@ -142,6 +144,7 @@ define([
                 fileId = null,
                 arrayFromObj = Array.from,
                 fileObj = [],
+                uploaderContainer = this.element.find('input[type="file"]').closest('.image-placeholder'),
                 options = {
                     proudlyDisplayPoweredByUppy: false,
                     target: targetElement,
@@ -188,7 +191,6 @@ define([
                         tempFileId:  fileId
                     };
 
-                    var uploaderContainer = this.element.find('input[type="file"]').closest('.image-placeholder');
                     uploaderContainer.addClass('loading');
                     fileObj.push(currentFile);
                     return modifiedFile;
@@ -245,7 +247,6 @@ define([
             });
 
             uppy.on('complete', () => {
-                var uploaderContainer = this.element.find('input[type="file"]').closest('.image-placeholder');
                 uploaderContainer.removeClass('loading');
                 Array.from = arrayFromObj;
             });

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

@@ -17,6 +17,7 @@ define([
     'Magento_Ui/js/form/element/abstract',
     'mage/backend/notification',
     'mage/translate',
+    'jquery/jquery.cookie',
     'jquery/uppy-core',
     'mage/adminhtml/tools'
 ], function ($, _, utils, uiAlert, validator, Element, notification, $t) {
@@ -67,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,
@@ -85,7 +85,7 @@ define([
                         hideProgressAfterFinish: true
                     };
 
-                if (fileInputName === undefined){
+                if (fileInputName === undefined) {
                     fileInputName = $(fileInput).attr('name');
                 }
                 // handle input type file
@@ -104,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;
                         }
 

dev/tests/js/jasmine/tests/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.test.js

@@ -8,7 +8,7 @@
 define([
     'jquery',
     'Magento_Backend/js/media-uploader'
-], function ($, mediaUploader) {
+], function ($) {
     'use strict';
 
     describe('Magento_Backend/js/media-uploader::_create()', function () {

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js

@@ -84,9 +84,9 @@ define([
                 expect(component.initUploader).toHaveBeenCalledWith(fileInputMock);
                 expect(component.replaceInputTypeFile).toHaveBeenCalledWith(fileInputMock);
 
-                expect(uppyMock.use).toHaveBeenCalledWith(Uppy.Dashboard, jasmine.any(Object));
-                expect(uppyMock.use).toHaveBeenCalledWith(Uppy.DropTarget, jasmine.any(Object));
-                expect(uppyMock.use).toHaveBeenCalledWith(Uppy.XHRUpload, jasmine.any(Object));
+                expect(uppyMock.use).toHaveBeenCalledWith(window.Uppy.Dashboard, jasmine.any(Object));
+                expect(uppyMock.use).toHaveBeenCalledWith(window.Uppy.DropTarget, jasmine.any(Object));
+                expect(uppyMock.use).toHaveBeenCalledWith(window.Uppy.XHRUpload, jasmine.any(Object));
             });
         });