OXDEV-8840 Fix ajax error message when using http2

OXID-eSales · Oct 23, 2024 · 6054a53 · 6054a53
1 parent a668709
commit 6054a53
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/assets/out/src/js/base.min.js b/assets/out/src/js/base.min.js
diff --git a/assets/out/src/js/base.min.js.map b/assets/out/src/js/base.min.js.map
diff --git a/build/js/base/medialibrary.js b/build/js/base/medialibrary.js
@@ -611,7 +611,7 @@
                                     ui._loadItemDetails(activeItem.data(), $dialog);
                                 },
                                 error: function (result, status, errorThrown) {
-                                    ddh.alert(ddh.translate(errorThrown));
+                                    ddh.alert(ddh.translate(result.responseJSON.error));
                                 }
                             });
                         }

diff --git a/src/Validation/Validator/FileNameValidator.php b/src/Validation/Validator/FileNameValidator.php
@@ -27,6 +27,11 @@ public function checkFilenameNotEmpty(string $fileName): void
         if (!$fileName) {
             throw new ValidationFailedException("OE_MEDIA_LIBRARY_EXCEPTION_FILENAME_EMPTY");
         }
+
+        $fileName = str_replace(' ', '', $fileName);
+        if (strlen($fileName) < 1) {
+            throw new ValidationFailedException("OE_MEDIA_LIBRARY_EXCEPTION_FILENAME_EMPTY");
+        }
     }
 
     public function checkFilenameDoesNotStartWithDot(string $fileName): void

diff --git a/tests/Unit/Validation/Validator/FileNameValidatorTest.php b/tests/Unit/Validation/Validator/FileNameValidatorTest.php
@@ -19,10 +19,18 @@
 #[CoversClass(FileNameValidator::class)]
 class FileNameValidatorTest extends TestCase
 {
-    public function testRegularFileNameDoesntThrowExceptions(): void
+    public static function goodFileNamesDataProvider(): \Generator
+    {
+        yield "regular file name" => [
+            'fileName' => uniqid(),
+        ];
+    }
+
+    #[DataProvider('goodFileNamesDataProvider')]
+    public function testRegularFileNameDoesntThrowExceptions(string $fileName): void
     {
         $filePathStub = $this->createConfiguredStub(FilePath::class, [
-            'getFileName' => uniqid()
+            'getFileName' => $fileName
         ]);
 
         $sut = new FileNameValidator();
@@ -31,20 +39,16 @@ public function testRegularFileNameDoesntThrowExceptions(): void
         $this->addToAssertionCount(1);
     }
 
-    public static function goodFileNamesDataProvider(): \Generator
-    {
-        yield "regular file name" => [
-            'baseName' => uniqid(),
-            'extension' => uniqid()
-        ];
-    }
-
     public static function badFileNamesDataProvider(): \Generator
     {
         yield "empty" => [
             'fileName' => ''
         ];
 
+        yield "empty with spaces" => [
+            'fileName' => ' '
+        ];
+
         yield "starts with dot" => [
             'fileName' => '.' . uniqid()
         ];