Merge pull request #5337 from magento-engcom/2.3.5-asi

sivaschenko · web-flow · commit 06f41c9fad32 · 2020-02-16T17:01:42.000Z
[Magento Community Engineering] 2.3.5 Adobe Stock Integration scope
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * Delete image files.
@@ -60,10 +60,15 @@ public function __construct(
      */
     public function execute()
     {
+        $resultJson = $this->resultJsonFactory->create();
+
+        if (!$this->getRequest()->isPost()) {
+            $result = ['error' => true, 'message' => __('Wrong request.')];
+            /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+            return $resultJson->setData($result);
+        }
+
         try {
-            if (!$this->getRequest()->isPost()) {
-                throw new \Exception('Wrong request.');
-            }
             $files = $this->getRequest()->getParam('files');
 
             /** @var $helper \Magento\Cms\Helper\Wysiwyg\Images */
@@ -79,17 +84,16 @@ public function execute()
                 /** @var \Magento\Framework\Filesystem $filesystem */
                 $filesystem = $this->_objectManager->get(\Magento\Framework\Filesystem::class);
                 $dir = $filesystem->getDirectoryRead(DirectoryList::MEDIA);
-                $filePath = $path . '/' . \Magento\Framework\File\Uploader::getCorrectFileName($file);
+                $filePath = $path . '/' . $file;
                 if ($dir->isFile($dir->getRelativePath($filePath)) && !preg_match('#.htaccess#', $file)) {
                     $this->getStorage()->deleteFile($filePath);
                 }
             }
-            
+
             return $this->resultRawFactory->create();
+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (\Exception $e) {
             $result = ['error' => true, 'message' => $e->getMessage()];
-            /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-            $resultJson = $this->resultJsonFactory->create();
 
             return $resultJson->setData($result);
         }
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
@@ -239,7 +239,7 @@ define([
         handleKeyDown: function (e) {
             var key = keyCodes[e.keyCode];
 
-            if (this.visibleRecord() !== null) {
+            if (this.visibleRecord() !== null && document.activeElement.tagName !== 'INPUT') {
                 if (key === 'pageLeftKey') {
                     this.prev(this.displayedRecord());
                 } else if (key === 'pageRightKey') {
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/image.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/image.js
@@ -80,6 +80,17 @@ define([
             return record.css || {};
         },
 
+        /**
+         * Get is active record
+         *
+         * @param {Object} record - Data to be preprocessed.
+         *
+         * @returns {Boolean}
+         */
+        getIsActive: function (record) {
+            return this.previewComponent().visibleRecord() === record._rowIndex || false;
+        },
+
         /**
          * Expand image preview
          */
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/color-picker.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/color-picker.js
@@ -71,6 +71,11 @@ define([
         update: function (element, valueAccessor, allBindings, viewModel) {
             var config = valueAccessor();
 
+            /** Initialise value as empty if it is undefined when color picker input is reset **/
+            if (config.value() === undefined) {
+                config.value('');
+            }
+
             if (tinycolor(config.value()).isValid() || config.value() === '') {
                 $(element).spectrum('set', config.value());
 
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/columns/image.html b/app/code/Magento/Ui/view/base/web/templates/grid/columns/image.html
@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 -->
-<div class="masonry-image-block" ko-style="$col.getStyles($row())" attr="'data-id': $col.getId($row())">
+<div class="masonry-image-block" ko-style="$col.getStyles($row())" css="{'active': $col.getIsActive($row())}" attr="'data-id': $col.getId($row())">
     <img attr="src: $col.getUrl($row())" css="$col.getClasses($row())" click="function(){ expandPreview($row()) }" data-role="thumbnail"/>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/masonry.html b/app/code/Magento/Ui/view/base/web/templates/grid/masonry.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<div data-role="grid-wrapper" class="masonry-image-grid" attr="'data-id': containerId">
+<div data-role="grid-wrapper" class="masonry-image-grid" attr="'data-id': containerId" tabindex="0">
     <div class="masonry-image-column" repeat="foreach: rows, item: '$row'">
         <div outerfasteach="data: getVisible(), as: '$col'" template="getBody()"/>
     </div>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Cms/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Cms/web/css/source/_module.less
@@ -6,6 +6,10 @@
     .media-gallery-modal {
         .page-main-actions {
             margin-bottom: 3rem;
+
+            .page-action-buttons {
+                text-align: right;
+            }
         }
 
         .new_folder {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_masonry-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_masonry-grid.less
@@ -5,6 +5,7 @@
 @admin__masonry_grid_image__space: 20px;
 @admin__masonry_grid_background_color: #fff;
 @admin__masonry_overlay_background_color: #507dc8;
+@admin__masonry_grid_active_image_border_color: #558dd6;
 
 & when (@media-common = true) {
     .masonry-image {
@@ -27,6 +28,15 @@
             margin: @admin__masonry_grid_image__space/2;
             overflow: hidden;
 
+            .masonry-image-block {
+                &.active {
+                    img {
+                        border: 2px @admin__masonry_grid_active_image_border_color solid;
+                        padding: 1px;
+                    }
+                }
+            }
+
             img {
                 cursor: pointer;
                 height: 100%;
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php
@@ -75,22 +75,47 @@ protected function setUp()
      * Execute method with correct directory path and file name to check that files under WYSIWYG media directory
      * can be removed.
      *
+     * @param string $filename
      * @return void
+     * @dataProvider executeDataProvider
      */
-    public function testExecute()
+    public function testExecute(string $filename)
     {
+        $filePath =  $this->fullDirectoryPath . DIRECTORY_SEPARATOR . $filename;
+        $fixtureDir = realpath(__DIR__ . '/../../../../../Catalog/_files');
+        copy($fixtureDir . '/' . $this->fileName, $filePath);
+
         $this->model->getRequest()->setMethod('POST')
-            ->setPostValue('files', [$this->imagesHelper->idEncode($this->fileName)]);
+            ->setPostValue('files', [$this->imagesHelper->idEncode($filename)]);
         $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
         $this->model->execute();
 
         $this->assertFalse(
             $this->mediaDirectory->isExist(
-                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . '/' . $this->fileName)
+                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . '/' . $filename)
             )
         );
     }
 
+    /**
+     * DataProvider for testExecute
+     *
+     * @return array
+     */
+    public function executeDataProvider(): array
+    {
+        return [
+            ['name with spaces.jpg'],
+            ['name with, comma.jpg'],
+            ['name with* asterisk.jpg'],
+            ['name with[ bracket.jpg'],
+            ['magento_small_image.jpg'],
+            ['_.jpg'],
+            [' - .jpg'],
+            ['-.jpg'],
+        ];
+    }
+
     /**
      * Check that htaccess file couldn't be removed via
      * \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles::execute method
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/image-preview.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/image-preview.test.js
@@ -13,10 +13,26 @@ define([
 
     describe('Ui/js/grid/columns/image-preview', function () {
         var record = {
-            _rowIndex: 1,
-            rowNumber: 1
-        },
-           imagePreview;
+                _rowIndex: 1,
+                rowNumber: 1
+            },
+            imagePreview,
+            recordMock = {
+                _rowIndex: 2
+            },
+            secondRecordMock = {
+                _rowIndex: 1,
+                rowNumber: 1
+            },
+            elementMock = {
+                keyCode: 37
+            },
+            masonryMock = {
+                shows: jasmine.createSpy().and.returnValue([]),
+                rows: jasmine.createSpy().and.returnValue({
+                    1: secondRecordMock
+                })
+            };
 
         beforeEach(function () {
             imagePreview = new Preview();
@@ -46,5 +62,36 @@ define([
             });
 
         });
+
+        describe('handleKeyDown method', function () {
+
+            it('verify record changed on key down', function () {
+                var imageMock = document.createElement('img'),
+                    originMock = $.fn.get;
+
+                spyOn($.fn, 'get').and.returnValue(imageMock);
+                imagePreview.visibleRecord = jasmine.createSpy().and.returnValue(2);
+                imagePreview.displayedRecord = ko.observable();
+                imagePreview.displayedRecord(recordMock);
+                imagePreview.masonry = jasmine.createSpy().and.returnValue(masonryMock);
+                imagePreview.handleKeyDown(elementMock);
+                expect(imagePreview.displayedRecord()._rowIndex).toBe(secondRecordMock._rowIndex);
+
+                $.fn.get = originMock;
+            });
+
+            it('verify record not changed on key down when active element input', function () {
+                var input = $('<input id=\'input-fixture\'/>');
+
+                $(document.body).append(input);
+                input.focus();
+                imagePreview.visibleRecord = jasmine.createSpy().and.returnValue(1);
+                imagePreview.displayedRecord = ko.observable(1);
+                imagePreview.handleKeyDown(elementMock);
+                expect(imagePreview.displayedRecord()).toBe(1);
+
+                $('#input-fixture').remove();
+            });
+        });
     });
 });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/color-picker.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/color-picker.test.js
@@ -85,5 +85,28 @@ define([
 
             expect($.fn.init).toHaveBeenCalledWith($input, undefined);
         });
+
+        it('Verify config value is empty when reset colorpicker intput', function () {
+            var value = {
+                    configStuffInHere: true,
+                    value: jasmine.createSpy().and.returnValue(undefined)
+                },
+                valueAccessor = jasmine.createSpy().and.returnValue(value),
+                viewModel = {
+                    disabled: jasmine.createSpy().and.returnValue(false)
+                };
+
+            $.fn.spectrum = jasmine.createSpy();
+            $input = jasmine.createSpy();
+
+            ko.bindingHandlers.colorPicker.update($input, valueAccessor, null, viewModel);
+            expect($.fn.spectrum).toHaveBeenCalledTimes(1);
+            expect(valueAccessor().value).toHaveBeenCalledTimes(4);
+
+            value.value = jasmine.createSpy().and.returnValue('');
+            ko.bindingHandlers.colorPicker.update($input, valueAccessor, null, viewModel);
+            expect($.fn.spectrum).toHaveBeenCalledTimes(3);
+            expect(valueAccessor().value).toHaveBeenCalledTimes(5);
+        });
     });
 });
