[Grid] Fix duplicated system collector name. (#442)

* Fix duplicated system collector name. * Fix duplicated system collector name.
pimcore · Sep 26, 2024 · b41c33a · b41c33a
1 parent 6a1ceb9
commit b41c33a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/Grid/Column/Collector/Asset/SystemFieldCollector.php b/src/Grid/Column/Collector/Asset/SystemFieldCollector.php
@@ -36,7 +36,7 @@ public function __construct(
 
     public function getCollectorName(): string
     {
-        return 'system';
+        return $this->getTypeName(). '.asset';
     }
 
     /**
@@ -56,7 +56,7 @@ public function getColumnConfigurations(array $availableColumnDefinitions): arra
 
             $column = new ColumnConfiguration(
                 key: $columnKey,
-                group: $this->getCollectorName(),
+                group: $this->getTypeName(),
                 sortable: $availableColumnDefinitions[$type]->isSortable(),
                 editable: false,
                 localizable: false,
@@ -84,7 +84,12 @@ public function supportedElementTypes(): array
 
     private function concatType(string $type): string
     {
-        return $this->getCollectorName() . '.' . $type;
+        return $this->getTypeName() . '.' . $type;
+    }
+
+    private function getTypeName(): string
+    {
+        return 'system';
     }
 
     private function getCustomFrontendAdapter(string $columnKey, string $defaultAdapter): string

diff --git a/src/Grid/Column/Collector/DataObject/SystemFieldCollector.php b/src/Grid/Column/Collector/DataObject/SystemFieldCollector.php
@@ -35,7 +35,7 @@ public function __construct(
 
     public function getCollectorName(): string
     {
-        return 'system';
+        return $this->getTypeName() . '.dataobject';
     }
 
     /**
@@ -55,7 +55,7 @@ public function getColumnConfigurations(array $availableColumnDefinitions): arra
 
             $column = new ColumnConfiguration(
                 key: $columnKey,
-                group: $this->getCollectorName(),
+                group: $this->getTypeName(),
                 sortable: $availableColumnDefinitions[$type]->isSortable(),
                 editable: false,
                 localizable: false,
@@ -80,6 +80,11 @@ public function supportedElementTypes(): array
 
     private function concatType(string $type): string
     {
-        return $this->getCollectorName() . '.' . $type;
+        return $this->getTypeName() . '.' . $type;
+    }
+
+    private function getTypeName(): string
+    {
+        return 'system';
     }
 }