ACP2E-446:[Magento Quans] Any insight into why to the insight sanitation on the new media gallery is now more restrictive

Author: thiaramus

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

@@ -45,7 +45,7 @@
         <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"/>

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

@@ -47,7 +47,7 @@
         <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"/>

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/templates/container.phtml

@@ -23,8 +23,7 @@
                         "masonryComponentPath": "media_gallery_listing.media_gallery_listing.media_gallery_columns"
                     }
                 }
-            },
-            "Magento_MediaGalleryUi/js/validation/validate-filename": {}
+            }
         }
     }
 </script>

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;
@@ -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
         }
     });
 });