Skip to content

Commit c2eb4e3

Browse files
veloravenveloraven
committed
Merge remote-tracking branch 'l3/ACP2E-446' into PR_L3_05_04_2022
2 parents 18e9be0 + 91d9477 commit c2eb4e3

File tree

5 files changed

+50
-4
lines changed

5 files changed

+50
-4
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<entity name="AdminMediaGalleryFolder2Data">
1515
<data key="name" unique="suffix">folder2</data>
1616
</entity>
17+
<entity name="AdminMediaGalleryFolder3Data">
18+
<data key="name" unique="suffix">folder_name-3</data>
19+
</entity>
1720
<entity name="AdminMediaGalleryFolderInvalidData">
1821
<data key="name">,.?/:;'[{]}|~`!@#$%^*()_=+</data>
1922
</entity>

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,27 @@
4545
<grabTextFrom selector="{{AdminMediaGalleryFolderSection.folderNameValidationMessage}}" stepKey="grabValidationMessage"/>
4646
<assertStringContainsString stepKey="assertFirst">
4747
<actualResult type="variable">grabValidationMessage</actualResult>
48-
<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>
48+
<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>
4949
</assertStringContainsString>
5050

5151
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"/>
5252
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
5353

54+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolderToCreateWithHyphenAndUnderscore">
55+
<argument name="name" value="wysiwyg"/>
56+
</actionGroup>
57+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderFormForWithHyphenAndUnderscore"/>
58+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolderWithHyphenAndSpace">
59+
<argument name="name" value="{{AdminMediaGalleryFolder3Data.name}}"/>
60+
</actionGroup>
61+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderWithHyphenAndSpaceCreated">
62+
<argument name="name" value="{{AdminMediaGalleryFolder3Data.name}}"/>
63+
</actionGroup>
64+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolderWithHyphenAndUnderscore"/>
65+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWithHyphenAndUnderscoreDeleted">
66+
<argument name="name" value="{{AdminMediaGalleryFolder3Data.name}}"/>
67+
</actionGroup>
68+
5469
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
5570
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearGridFilters"/>
5671
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,27 @@
4747
<grabTextFrom selector="{{AdminMediaGalleryFolderSection.folderNameValidationMessage}}" stepKey="grabValidationMessage"/>
4848
<assertStringContainsString stepKey="assertFirst">
4949
<actualResult type="variable">grabValidationMessage</actualResult>
50-
<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>
50+
<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>
5151
</assertStringContainsString>
5252

5353
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"/>
5454
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
5555

56+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolderToCreateWithHyphenAndUnderscore">
57+
<argument name="name" value="wysiwyg"/>
58+
</actionGroup>
59+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderFormForWithHyphenAndUnderscore"/>
60+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolderWithHyphenAndSpace">
61+
<argument name="name" value="{{AdminMediaGalleryFolder3Data.name}}"/>
62+
</actionGroup>
63+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderWithHyphenAndSpaceCreated">
64+
<argument name="name" value="{{AdminMediaGalleryFolder3Data.name}}"/>
65+
</actionGroup>
66+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolderWithHyphenAndUnderscore"/>
67+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWithHyphenAndUnderscoreDeleted">
68+
<argument name="name" value="{{AdminMediaGalleryFolder3Data.name}}"/>
69+
</actionGroup>
70+
5671
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGalleryForPage"/>
5772
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearGridFilters"/>
5873
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ Directory,Directory
66
"Modification Date","Modification Date"
77
Overlay,Overlay
88
"Thumbnail Image","Thumbnail Image"
9+
"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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ define([
3939
*/
4040
initialize: function () {
4141
this._super().observe(['selectedFolder']);
42+
this._addValidation();
4243
this.initEvents();
4344

4445
return this;
@@ -123,10 +124,10 @@ define([
123124
content: $t(data.content),
124125
modalClass: 'media-gallery-folder-prompt',
125126
validation: true,
126-
validationRules: ['required-entry', 'validate-alphanum'],
127+
validationRules: ['required-entry', 'validate-filename'],
127128
attributesField: {
128129
name: 'folder_name',
129-
'data-validate': '{required:true, validate-alphanum}',
130+
'data-validate': '{required:true, validate-filename}',
130131
maxlength: '128'
131132
},
132133
attributesForm: {
@@ -191,6 +192,17 @@ define([
191192

192193
this.selectedFolder(folderId);
193194
$(this.deleteButtonSelector).prop('disabled', false).removeClass('disabled');
195+
},
196+
197+
/**
198+
* @private
199+
*/
200+
_addValidation: function () {
201+
$.validator.addMethod(
202+
'validate-filename', function (value) {
203+
return $.mage.isEmptyNoTrim(value) || /^[a-z0-9\-\_]+$/si.test(value);
204+
},
205+
$.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
194206
}
195207
});
196208
});

0 commit comments

Comments
 (0)