Merge pull request #192 from lara-zeus/fix-collection

Fix collection
lara-zeus · Oct 15, 2023 · dd528cb · dd528cb
2 parents 378552b + 17690a5
commit dd528cb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/Filament/Resources/ResponseResource/Pages/ReportResponses.php b/src/Filament/Resources/ResponseResource/Pages/ReportResponses.php
@@ -48,16 +48,23 @@ public function table(Table $table): Table
                 ->toggleable(),*/
             TextColumn::make('user.name')
                 ->label(__('User Name'))
+                ->toggleable()
+                ->sortable()
                 ->searchable(),
             TextColumn::make('status')
+                ->toggleable()
+                ->sortable()
                 ->badge()
                 ->label(__('status'))
                 ->colors(BoltPlugin::getModel('FormsStatus')::pluck('key', 'color')->toArray())
                 ->icons(BoltPlugin::getModel('FormsStatus')::pluck('key', 'icon')->toArray())
                 ->grow(false)
                 ->searchable('status'),
 
-            TextColumn::make('notes')->toggleable(),
+            TextColumn::make('notes')
+                ->label(__('notes'))
+                ->sortable()
+                ->toggleable(),
         ];
 
         /**
@@ -77,7 +84,10 @@ public function table(Table $table): Table
                 ->toggleable();
         }
 
-        $mainColumns[] = TextColumn::make('created_at')->toggleable();
+        $mainColumns[] = TextColumn::make('created_at')
+            ->sortable()
+            ->label(__('created at'))
+            ->toggleable();
 
         return $table
             ->query(

diff --git a/src/Models/Collection.php b/src/Models/Collection.php
@@ -33,7 +33,7 @@ public function getValuesListAttribute(): ?string
             return $allValues
                 ->take(5)
                 ->map(function ($item) {
-                    return $item['itemValue'];
+                    return $item['itemValue'] ?? null;
                 })
                 ->join(',');
         }