Skip to content

Commit

Permalink
Merge pull request #8765 from magento-cia/cia-2.4.7-beta3-develop-2.4…
Browse files Browse the repository at this point in the history 
…-develop-sync-02162024

Cia 2.4.7 beta3 develop 2.4 develop sync 02162024
  • Loading branch information
@sidolov
sidolov authored Feb 18, 2024
2 parents d8db009 + cb0b976 commit 7fe2777
Show file tree
Hide file tree
Showing 316 changed files with 8,162 additions and 12,705 deletions.
80 changes: 69 additions & 11 deletions app/code/Magento/AwsS3/Test/Mftf/Helper/MockTestLogger.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,49 +14,107 @@
*
* Ignores most log messages but throws errors on error/critical/emergency logs so tests will fail
*/
class MockTestLogger implements LoggerInterface {

public function emergency($message, array $context = array())
class MockTestLogger implements LoggerInterface
{
/**
* @param $message
* @param array $context
* @return void
* @throws \Exception
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function emergency($message, array $context = []): void
{
throw new \Exception($message);
}

public function alert($message, array $context = array())
/**
* @param $message
* @param array $context
* @return void
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function alert($message, array $context = []): void
{
// noop
}

public function critical($message, array $context = array())
/**
* @param $message
* @param array $context
* @return void
* @throws \Exception
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function critical($message, array $context = []): void
{
throw new \Exception($message);
}

public function error($message, array $context = array())
/**
* @param $message
* @param array $context
* @return void
* @throws \Exception
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function error($message, array $context = []): void
{
throw new \Exception($message);
}

public function warning($message, array $context = array())
/**
* @param $message
* @param array $context
* @return void
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function warning($message, array $context = []): void
{
// noop
}

public function notice($message, array $context = array())
/**
* @param $message
* @param array $context
* @return void
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function notice($message, array $context = []): void
{
// noop
}

public function info($message, array $context = array())
/**
* @param $message
* @param array $context
* @return void
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function info($message, array $context = []): void
{
// noop
}

public function debug($message, array $context = array())
/**
* @param $message
* @param array $context
* @return void
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function debug($message, array $context = []): void
{
// noop
}

public function log($level, $message, array $context = array())
/**
* @param $level
* @param $message
* @param array $context
* @return void
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function log($level, $message, array $context = []): void
{
// noop
}
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

// phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
/** @var $block \Magento\Backend\Block\Media\Uploader */
/** @var \Magento\Framework\Escaper $escaper */
?>

<div id="<?= $block->getHtmlId() ?>" class="uploader"
Expand All @@ -19,9 +20,8 @@
}'
>
<div class="fileinput-button form-buttons button">
<span><?= $block->escapeHtml(__('Browse Files...')) ?></span>
<input id="fileupload" type="file" name="<?= $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>"
data-url="<?= $block->escapeHtmlAttr($block->getConfig()->getUrl()) ?>" multiple="multiple" />
<span><?= $escaper->escapeHtml(__('Browse Files...')) ?></span>
<div id="fileUploader" data-url="<?= $escaper->escapeHtmlAttr($block->getConfig()->getUrl()) ?>"></div>
</div>
<div class="clear"></div>
<script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template" data-template="uploader">
Expand Down
210 changes: 124 additions & 86 deletions app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
* See COPYING.txt for license details.
*/

/* eslint-disable no-undef */

/**
* @api
*/
Expand All @@ -15,11 +17,11 @@ define([
'Magento_Ui/js/modal/alert',
'Magento_Ui/js/form/element/file-uploader',
'mage/translate',
'jquery/file-uploader'
'jquery/uppy-core'
], function ($, mageTemplate, alert, FileUploader) {
'use strict';

var fileUploader = new FileUploader({
let fileUploader = new FileUploader({
dataScope: '',
isMultipleFiles: true
});
Expand All @@ -33,113 +35,149 @@ define([
* @private
*/
_create: function () {
var self = this,
let self = this,
arrayFromObj = Array.from,
progressTmpl = mageTemplate('[data-template="uploader"]'),
isResizeEnabled = this.options.isResizeEnabled,
resizeConfiguration = {
action: 'resizeImage',
maxWidth: this.options.maxWidth,
maxHeight: this.options.maxHeight
uploaderElement = '#fileUploader',
targetElement = this.element.find('.fileinput-button.form-buttons')[0],
uploadUrl = $(uploaderElement).attr('data-url'),
fileId = null,
allowedExt = ['jpeg', 'jpg', 'png', 'gif'],
allowedResize = false,
options = {
proudlyDisplayPoweredByUppy: false,
target: targetElement,
hideUploadButton: true,
hideRetryButton: true,
hideCancelButton: true,
inline: true,
debug:true,
showRemoveButtonAfterComplete: true,
showProgressDetails: false,
showSelectedFiles: false,
hideProgressAfterFinish: true
};

if (!isResizeEnabled) {
resizeConfiguration = {
action: 'resizeImage'
};
}
$(document).on('click', uploaderElement ,function () {
$(uploaderElement).closest('.fileinput-button.form-buttons')
.find('.uppy-Dashboard-browse').trigger('click');
});

this.element.find('input[type=file]').fileupload({
dataType: 'json',
formData: {
'form_key': window.FORM_KEY
},
dropZone: this.element.find('input[type=file]').closest('[role="dialog"]'),
sequentialUploads: true,
acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
maxFileSize: this.options.maxFileSize,

/**
* @param {Object} e
* @param {Object} data
*/
add: function (e, data) {
var fileSize,
const uppy = new Uppy.Uppy({
autoProceed: true,

onBeforeFileAdded: (currentFile) => {
let fileSize,
tmpl;

$.each(data.files, function (index, file) {
fileSize = typeof file.size == 'undefined' ?
$.mage.__('We could not detect a size.') :
byteConvert(file.size);
fileSize = typeof currentFile.size == 'undefined' ?
$.mage.__('We could not detect a size.') :
byteConvert(currentFile.size);

data.fileId = Math.random().toString(33).substr(2, 18);
// check if file is allowed to upload and resize
allowedResize = $.inArray(currentFile.extension, allowedExt) !== -1;

tmpl = progressTmpl({
data: {
name: file.name,
size: fileSize,
id: data.fileId
}
});
if (!allowedResize) {
fileUploader.aggregateError(currentFile.name,
$.mage.__('Disallowed file type.'));
fileUploader.onLoadingStop();
return false;
}

$(tmpl).appendTo(self.element);
});
fileId = Math.random().toString(33).substr(2, 18);

$(this).fileupload('process', data).done(function () {
data.submit();
tmpl = progressTmpl({
data: {
name: currentFile.name,
size: fileSize,
id: fileId
}
});

// code to allow duplicate files from same folder
const modifiedFile = {
...currentFile,
id: currentFile.id + '-' + fileId,
tempFileId: fileId
};

$(tmpl).appendTo(self.element);
return modifiedFile;
},

/**
* @param {Object} e
* @param {Object} data
*/
done: function (e, data) {
if (data.result && !data.result.error) {
self.element.trigger('addItem', data.result);
} else {
fileUploader.aggregateError(data.files[0].name, data.result.error);
meta: {
'form_key': window.FORM_KEY,
isAjax : true
}
});

// initialize Uppy upload
uppy.use(Uppy.Dashboard, options);

// Resize Image as per configuration
if (this.options.isResizeEnabled) {
uppy.use(Uppy.Compressor, {
maxWidth: this.options.maxWidth,
maxHeight: this.options.maxHeight,
quality: 0.92,
beforeDraw() {
if (!allowedResize) {
this.abort();
}
}
});
}

self.element.find('#' + data.fileId).remove();
// drop area for file upload
uppy.use(Uppy.DropTarget, {
target: targetElement,
onDragOver: () => {
// override Array.from method of legacy-build.min.js file
Array.from = null;
},
onDragLeave: () => {
Array.from = arrayFromObj;
}
});

/**
* @param {Object} e
* @param {Object} data
*/
progress: function (e, data) {
var progress = parseInt(data.loaded / data.total * 100, 10),
progressSelector = '#' + data.fileId + ' .progressbar-container .progressbar';
// upload files on server
uppy.use(Uppy.XHRUpload, {
endpoint: uploadUrl,
fieldName: 'image'
});

self.element.find(progressSelector).css('width', progress + '%');
},
uppy.on('upload-success', (file, response) => {
if (response.body && !response.body.error) {
self.element.trigger('addItem', response.body);
} else {
fileUploader.aggregateError(file.name, response.body.error);
}

/**
* @param {Object} e
* @param {Object} data
*/
fail: function (e, data) {
var progressSelector = '#' + data.fileId;

self.element.find(progressSelector).removeClass('upload-progress').addClass('upload-failure')
.delay(2000)
.hide('highlight')
.remove();
},
self.element.find('#' + file.tempFileId).remove();
});

stop: fileUploader.uploaderConfig.stop
uppy.on('upload-progress', (file, progress) => {
let progressWidth = parseInt(progress.bytesUploaded / progress.bytesTotal * 100, 10),
progressSelector = '#' + file.tempFileId + ' .progressbar-container .progressbar';

self.element.find(progressSelector).css('width', progressWidth + '%');
});

this.element.find('input[type=file]').fileupload('option', {
processQueue: [{
action: 'loadImage',
fileTypes: /^image\/(gif|jpeg|png)$/
},
resizeConfiguration,
{
action: 'saveImage'
}]
uppy.on('upload-error', (error, file) => {
let progressSelector = '#' + file.tempFileId;

self.element.find(progressSelector).removeClass('upload-progress').addClass('upload-failure')
.delay(2000)
.hide('highlight')
.remove();
});

uppy.on('complete', () => {
fileUploader.uploaderConfig.stop();
$(window).trigger('reload.MediaGallery');
Array.from = arrayFromObj;
});

}
});

Expand Down
Loading

0 comments on commit 7fe2777

Please sign in to comment.