🔃 [Magento Community Engineering] Community Contributions - 2.4-develop

Accepted Community Pull Requests:
 - #27092: Adding failure callback to ui file uploader (by @bartoszkubicki)
 - #29885: Prevent flushing same tags several times (by @siimm)


Fixed GitHub Issues:
 - #29557: [Issue] Adding failure callback to ui file uploader (reported by @m2-assistant[bot]) has been fixed in #27092 by @bartoszkubicki in 2.4-develop branch
   Related commits:
     1. 3f7a163
     2. c00b24d
     3. f15cf5e
     4. 939056f
     5. 71bc1f4
     6. 1e9001b
     7. 82290c6
     8. 9d99f32
     9. 9cfff6e

 - #29890: [Issue] Prevent flushing same tags several times (reported by @m2-assistant[bot]) has been fixed in #29885 by @siimm in 2.4-develop branch
   Related commits:
     1. 256cedd
     2. f17148f
     3. 47761ec
     4. 2844fbf

Author: magento-engcom-team

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

@@ -54,13 +54,14 @@ define([
             this.$fileInput = fileInput;
 
             _.extend(this.uploaderConfig, {
-                dropZone:   $(fileInput).closest(this.dropZone),
-                change:     this.onFilesChoosed.bind(this),
-                drop:       this.onFilesChoosed.bind(this),
-                add:        this.onBeforeFileUpload.bind(this),
-                done:       this.onFileUploaded.bind(this),
-                start:      this.onLoadingStart.bind(this),
-                stop:       this.onLoadingStop.bind(this)
+                dropZone: $(fileInput).closest(this.dropZone),
+                change: this.onFilesChoosed.bind(this),
+                drop: this.onFilesChoosed.bind(this),
+                add: this.onBeforeFileUpload.bind(this),
+                fail: this.onFail.bind(this),
+                done: this.onFileUploaded.bind(this),
+                start: this.onLoadingStart.bind(this),
+                stop: this.onLoadingStop.bind(this)
             });
 
             $(fileInput).fileupload(this.uploaderConfig);
@@ -328,11 +329,12 @@ define([
          * May be used for implementation of additional validation rules,
          * e.g. total files and a total size rules.
          *
-         * @param {Event} e - Event object.
+         * @param {Event} event - Event object.
          * @param {Object} data - File data that will be uploaded.
          */
-        onFilesChoosed: function (e, data) {
-            // no option exists in fileuploader for restricting upload chains to single files; this enforces that policy
+        onFilesChoosed: function (event, data) {
+            // no option exists in file uploader for restricting upload chains to single files
+            // this enforces that policy
             if (!this.isMultipleFiles) {
                 data.files.splice(1);
             }
@@ -341,13 +343,13 @@ define([
         /**
          * Handler which is invoked prior to the start of a file upload.
          *
-         * @param {Event} e - Event object.
+         * @param {Event} event - Event object.
          * @param {Object} data - File data that will be uploaded.
          */
-        onBeforeFileUpload: function (e, data) {
-            var file     = data.files[0],
-                allowed  = this.isFileAllowed(file),
-                target   = $(e.target);
+        onBeforeFileUpload: function (event, data) {
+            var file = data.files[0],
+                allowed = this.isFileAllowed(file),
+                target = $(event.target);
 
             if (this.disabled()) {
                 this.notifyError($t('The file upload field is disabled.'));
@@ -356,7 +358,7 @@ define([
             }
 
             if (allowed.passed) {
-                target.on('fileuploadsend', function (event, postData) {
+                target.on('fileuploadsend', function (eventBound, postData) {
                     postData.data.append('param_name', this.paramName);
                 }.bind(data));
 
@@ -386,16 +388,25 @@ define([
             });
         },
 
+        /**
+         * @param {Event} event
+         * @param {Object} data
+         */
+        onFail: function (event, data) {
+            console.error(data.jqXHR.responseText);
+            console.error(data.jqXHR.status);
+        },
+
         /**
          * Handler of the file upload complete event.
          *
-         * @param {Event} e
+         * @param {Event} event
          * @param {Object} data
          */
-        onFileUploaded: function (e, data) {
+        onFileUploaded: function (event, data) {
             var uploadedFilename = data.files[0].name,
-                file    = data.result,
-                error   = file.error;
+                file = data.result,
+                error = file.error;
 
             error ?
                 this.aggregateError(uploadedFilename, error) :
@@ -469,10 +480,10 @@ define([
          * Handler of the preview image load event.
          *
          * @param {Object} file - File associated with an image.
-         * @param {Event} e
+         * @param {Event} event
          */
-        onPreviewLoad: function (file, e) {
-            var img = e.currentTarget;
+        onPreviewLoad: function (file, event) {
+            var img = event.currentTarget;
 
             file.previewWidth = img.naturalWidth;
             file.previewHeight = img.naturalHeight;

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

@@ -358,6 +358,27 @@ define([
             });
         });
 
+        describe('onFail handler', function () {
+            it('it logs responseText and status', function () {
+                var fakeEvent = {
+                        target: document.createElement('input')
+                    },
+                    data = {
+                        jqXHR: {
+                            responseText: 'Failed',
+                            status: '500'
+                        }
+                    };
+
+                spyOn(console, 'error');
+
+                component.onFail(fakeEvent, data);
+                expect(console.error).toHaveBeenCalledWith(data.jqXHR.responseText);
+                expect(console.error).toHaveBeenCalledWith(data.jqXHR.status);
+                expect(console.error).toHaveBeenCalledTimes(2);
+            });
+        });
+
         describe('aggregateError method', function () {
             it('should append onto aggregatedErrors array when called', function () {
                 spyOn(component.aggregatedErrors, 'push');

lib/internal/Magento/Framework/Indexer/CacheContext.php

@@ -73,6 +73,6 @@ public function getIdentities()
                 $identities[] = $cacheTag . '_' . $id;
             }
         }
-        return array_merge($identities, array_unique($this->tags));
+        return array_unique(array_merge($identities, array_unique($this->tags)));
     }
 }

lib/internal/Magento/Framework/Indexer/Test/Unit/CacheContextTest.php

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Indexer\Test\Unit;
+
+use Magento\Framework\Indexer\CacheContext;
+use PHPUnit\Framework\TestCase;
+
+class CacheContextTest extends TestCase
+{
+    /**
+     * @var Batch
+     */
+    private $object;
+
+    protected function setUp(): void
+    {
+        $this->object = new CacheContext();
+    }
+
+    /**
+     * @param array $tagsData
+     * @param array $expected
+     * @dataProvider getTagsDataProvider
+     */
+    public function testUniqueTags($tagsData, $expected)
+    {
+        foreach ($tagsData as $tagSet) {
+            foreach ($tagSet as $cacheTag => $ids) {
+                $this->object->registerEntities($cacheTag, $ids);
+            }
+        }
+
+        $this->assertEquals($this->object->getIdentities(), $expected);
+    }
+
+    /**
+     * @return array
+     */
+    public function getTagsDataProvider()
+    {
+        return [
+            'same entities and ids' => [
+                [['cat_p' => [1]], ['cat_p' => [1]]],
+                ['cat_p_1']
+            ],
+            'same entities with overlapping ids' => [
+                [['cat_p' => [1, 2, 3]], ['cat_p' => [3]]],
+                ['cat_p_1', 'cat_p_2', 'cat_p_3']
+            ]
+        ];
+    }
+}