MC-2294: Image still displayed after deleting it from Media Gallery Storage

- Supporting changes to media browser

Author: nathanjosiah

app/code/Magento/Ui/view/base/web/js/form/element/abstract.js

@@ -407,7 +407,7 @@ define([
             this.bubble('error', message);
 
             //TODO: Implement proper result propagation for form
-            if (!isValid) {
+            if (this.source && !isValid) {
                 this.source.set('params.invalid', true);
             }
 

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

@@ -43,17 +43,22 @@ define([
          */
         addFileFromMediaGallery: function (imageUploader, e) {
             var $buttonEl = $(e.target),
+                fileId = $buttonEl.data('id'),
                 fileSize = $buttonEl.data('size'),
                 fileMimeType = $buttonEl.data('mime-type'),
                 filePathname = $buttonEl.val(),
                 fileBasename = filePathname.split('/').pop();
 
-            this.addFile({
-                type: fileMimeType,
-                name: fileBasename,
-                size: fileSize,
-                url: filePathname
-            });
+            if (filePathname.length > 0) {
+                this.addFile({
+                    id: fileId,
+                    type: fileMimeType,
+                    name: fileBasename,
+                    size: fileSize,
+                    url: filePathname
+                });
+            }
+
         },
 
         /**

dev/tests/acceptance/.htaccess

@@ -0,0 +1,11 @@
+##############################################
+## Allow access to command.php
+    <FilesMatch "command.php">
+        <IfVersion < 2.4>
+            order allow,deny
+            allow from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all granted
+        </IfVersion>
+    </FilesMatch>

lib/web/mage/adminhtml/browser.js

@@ -276,6 +276,7 @@ define([
                 } else {
                     targetEl
                         .val(data)
+                        .data('id', fileRow.attr('id'))
                         .data('size', fileRow.data('size'))
                         .data('mime-type', fileRow.data('mime-type'))
                         .trigger('change');
@@ -433,8 +434,19 @@ define([
                             context: self.element,
                             showLoader: true
                         }).done($.proxy(function () {
+                            var targetEl = self.getTargetElement();
+
                             self.reload();
                             self.element.find('#delete_files').toggleClass(self.options.hidden, true);
+
+                            if ($.inArray(targetEl.data('id'), ids) > -1) {
+                                targetEl
+                                    .val('')
+                                    .data('id', null)
+                                    .data('mime-type', null)
+                                    .data('size', null)
+                                    .trigger('change');
+                            }
                         }, this));
                     },