Fix table columns and sorting for Wishlist items in the control panel

Author: engram-design

src/elements/Item.php

@@ -82,33 +82,52 @@ protected static function defineActions(string $source = null): array
 
     protected static function defineSearchableAttributes(): array
     {
-        return ['title', 'elementDisplay'];
+        return ['title', 'elementClass'];
     }
 
     protected static function defineSortOptions(): array
     {
         return [
-            'title' => Craft::t('app', 'Item'),
-            'elementDisplay' => Craft::t('app', 'Type'),
-            'dateCreated' => Craft::t('app', 'Date Created'),
+            [
+                'label' => Craft::t('app', 'Title'),
+                'orderBy' => 'elementTitle',
+                'attribute' => 'title',
+            ],
+            [
+                'label' => Craft::t('app', 'Type'),
+                'orderBy' => 'elementClass',
+                'attribute' => 'elementClass',
+            ],
+            [
+                'label' => Craft::t('app', 'Date Created'),
+                'orderBy' => 'dateCreated',
+                'defaultDir' => 'desc',
+            ],
+            [
+                'label' => Craft::t('app', 'Date Updated'),
+                'orderBy' => 'dateUpdated',
+                'defaultDir' => 'desc',
+            ],
+            [
+                'label' => Craft::t('app', 'ID'),
+                'orderBy' => 'id',
+            ],
         ];
     }
 
     protected static function defineTableAttributes(): array
     {
-        return [
-            'title' => ['label' => Craft::t('app', 'Item')],
-            'elementDisplay' => ['label' => Craft::t('app', 'Type')],
-            'dateCreated' => ['label' => Craft::t('app', 'Date Created')],
-        ];
+        return array_merge(parent::defineTableAttributes(), [
+            'elementClass' => ['label' => Craft::t('app', 'Type')],
+        ]);
     }
 
     protected static function defineDefaultTableAttributes(string $source): array
     {
         $attributes = [];
 
         $attributes[] = 'title';
-        $attributes[] = 'elementDisplay';
+        $attributes[] = 'elementClass';
         $attributes[] = 'dateCreated';
 
         return $attributes;
@@ -429,4 +448,13 @@ protected function cpEditUrl(): ?string
     {
         return UrlHelper::cpUrl('wishlist/lists/' . $this->getList()->getType()->handle . '/' . $this->listId . '/items/' . $this->id);
     }
+
+    protected function attributeHtml(string $attribute): string
+    {
+        if ($attribute == 'elementClass') {
+            return $this->getElementDisplay();
+        }
+
+        return parent::attributeHtml($attribute);
+    }
 }