Merge remote-tracking branch 'l3/ACP2E-446' into PR_L3_05_04_2022

Author: veloraven

app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml

@@ -14,6 +14,9 @@
     <entity name="AdminMediaGalleryFolder2Data">
         <data key="name" unique="suffix">folder2</data>
     </entity>
+    <entity name="AdminMediaGalleryFolder3Data">
+        <data key="name" unique="suffix">folder_name-3</data>
+    </entity>
     <entity name="AdminMediaGalleryFolderInvalidData">
         <data key="name">,.?/:;'[{]}|~`!@#$%^*()_=+</data>
     </entity>

app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateDeleteFolderTest.xml

@@ -45,12 +45,27 @@
         <grabTextFrom selector="{{AdminMediaGalleryFolderSection.folderNameValidationMessage}}" stepKey="grabValidationMessage"/>
         <assertStringContainsString stepKey="assertFirst">
             <actualResult type="variable">grabValidationMessage</actualResult>
-            <expectedResult type="string">Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.</expectedResult>
+            <expectedResult type="string">Please use only letters (a-z or A-Z), numbers (0-9), underscore (_) or hyphen (-) in this field. No spaces or other characters are allowed.</expectedResult>
         </assertStringContainsString>
 
         <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"/>
         <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
 
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolderToCreateWithHyphenAndUnderscore">
+            <argument name="name" value="wysiwyg"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderFormForWithHyphenAndUnderscore"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolderWithHyphenAndSpace">
+            <argument name="name" value="{{AdminMediaGalleryFolder3Data.name}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderWithHyphenAndSpaceCreated">
+            <argument name="name" value="{{AdminMediaGalleryFolder3Data.name}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolderWithHyphenAndUnderscore"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWithHyphenAndUnderscoreDeleted">
+            <argument name="name" value="{{AdminMediaGalleryFolder3Data.name}}"/>
+        </actionGroup>
+
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearGridFilters"/>
         <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">

app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryCreateDeleteFolderTest.xml

@@ -47,12 +47,27 @@
         <grabTextFrom selector="{{AdminMediaGalleryFolderSection.folderNameValidationMessage}}" stepKey="grabValidationMessage"/>
         <assertStringContainsString stepKey="assertFirst">
             <actualResult type="variable">grabValidationMessage</actualResult>
-            <expectedResult type="string">Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.</expectedResult>
+            <expectedResult type="string">Please use only letters (a-z or A-Z), numbers (0-9), underscore (_) or hyphen (-) in this field. No spaces or other characters are allowed.</expectedResult>
         </assertStringContainsString>
 
         <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"/>
         <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
 
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolderToCreateWithHyphenAndUnderscore">
+            <argument name="name" value="wysiwyg"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderFormForWithHyphenAndUnderscore"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolderWithHyphenAndSpace">
+            <argument name="name" value="{{AdminMediaGalleryFolder3Data.name}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderWithHyphenAndSpaceCreated">
+            <argument name="name" value="{{AdminMediaGalleryFolder3Data.name}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolderWithHyphenAndUnderscore"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWithHyphenAndUnderscoreDeleted">
+            <argument name="name" value="{{AdminMediaGalleryFolder3Data.name}}"/>
+        </actionGroup>
+
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGalleryForPage"/>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearGridFilters"/>
         <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">

app/code/Magento/MediaGalleryUi/i18n/en_US.csv

@@ -6,3 +6,4 @@ Directory,Directory
 "Modification Date","Modification Date"
 Overlay,Overlay
 "Thumbnail Image","Thumbnail Image"
+"Please use only letters (a-z or A-Z), numbers (0-9), underscore (_) or hyphen (-) in this field. No spaces or other characters are allowed.","Please use only letters (a-z or A-Z), numbers (0-9), underscore (_) or hyphen (-) in this field. No spaces or other characters are allowed."

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directories.js

@@ -39,6 +39,7 @@ define([
          */
         initialize: function () {
             this._super().observe(['selectedFolder']);
+            this._addValidation();
             this.initEvents();
 
             return this;
@@ -123,10 +124,10 @@ define([
                     content:  $t(data.content),
                     modalClass: 'media-gallery-folder-prompt',
                     validation: true,
-                    validationRules: ['required-entry', 'validate-alphanum'],
+                    validationRules: ['required-entry', 'validate-filename'],
                     attributesField: {
                         name: 'folder_name',
-                        'data-validate': '{required:true, validate-alphanum}',
+                        'data-validate': '{required:true, validate-filename}',
                         maxlength: '128'
                     },
                     attributesForm: {
@@ -191,6 +192,17 @@ define([
 
             this.selectedFolder(folderId);
             $(this.deleteButtonSelector).prop('disabled', false).removeClass('disabled');
+        },
+
+        /**
+         * @private
+         */
+        _addValidation: function () {
+            $.validator.addMethod(
+                'validate-filename', function (value) {
+                    return $.mage.isEmptyNoTrim(value) || /^[a-z0-9\-\_]+$/si.test(value);
+                },
+                $.mage.__('Please use only letters (a-z or A-Z), numbers (0-9), underscore (_) or hyphen (-) in this field. No spaces or other characters are allowed.')); //eslint-disable-line max-len
         }
     });
 });