[Bug] Fix sorting by fileSize. (#717)

* Add mapping from size to filesize. * Fix typo. * Fix Test. * Fix Test.
pimcore · Jan 22, 2025 · b980272 · b980272
1 parent b986081
commit b980272
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/src/Grid/Mapper/ColumnMapper.php b/src/Grid/Mapper/ColumnMapper.php
@@ -33,7 +33,7 @@
         'filename' => 'string',
         'creationDate' => 'datetime',
         'modificationDate' => 'datetime',
-        'size' => 'fileSize',
+        'fileSize' => 'fileSize',
         'key' => 'string',
         'published' => 'boolean',
         'classname' => 'string',

diff --git a/src/Grid/Service/SystemColumnService.php b/src/Grid/Service/SystemColumnService.php
@@ -35,6 +35,8 @@ public function getSystemColumnsForAssets(): array
         $systemColumns = Service::GRID_SYSTEM_COLUMNS;
         $columns = [];
         foreach ($systemColumns as $column) {
+            $column = $this->mapCustomColumnKeys($column);
+
             $columns[$column] = $this->columnMapper->getType($column);
         }
 
@@ -51,4 +53,13 @@ public function getSystemColumnsForDataObjects(): array
 
         return $columns;
     }
+
+    private function mapCustomColumnKeys(string $key): string
+    {
+        $keyMapping = [
+            'size' => 'fileSize',
+        ];
+
+        return $keyMapping[$key] ?? $key;
+    }
 }
diff --git a/tests/Unit/Grid/Mapper/ColumnMapperTest.php b/tests/Unit/Grid/Mapper/ColumnMapperTest.php
@@ -79,7 +79,7 @@ public function testMapperForModificationDate(): void
     public function testMapperForSize(): void
     {
         $mapper = new ColumnMapper();
-        $this->assertSame('fileSize', $mapper->getType('size'));
+        $this->assertSame('fileSize', $mapper->getType('fileSize'));
     }
 
     public function testMapperForKey(): void

diff --git a/tests/Unit/Grid/Service/SystemColumnServiceTest.php b/tests/Unit/Grid/Service/SystemColumnServiceTest.php
@@ -38,7 +38,7 @@ public function testGetSystemColumnsForAssets(): void
             'filename' => 'string',
             'creationDate' => 'datetime',
             'modificationDate' => 'datetime',
-            'size' => 'fileSize',
+            'fileSize' => 'fileSize',
             'mimetype' => 'string',
         ], $systemColumnService->getSystemColumnsForAssets());
     }