wip

mahfoudfx · Nov 29, 2021 · 41fc242 · 41fc242
1 parent e227513
commit 41fc242
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/Http/Middleware/Authenticate.php b/src/Http/Middleware/Authenticate.php
@@ -2,7 +2,6 @@
 
 namespace Filament\Http\Middleware;
 
-use Exception;
 use Filament\Models\Contracts\FilamentUser;
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
 

diff --git a/src/Pages/Actions/SelectAction.php b/src/Pages/Actions/SelectAction.php
@@ -2,17 +2,19 @@
 
 namespace Filament\Pages\Actions;
 
+use Illuminate\Contracts\Support\Arrayable;
+
 class SelectAction extends Action
 {
     use Concerns\HasId;
 
     protected string $view = 'filament::components.actions.select-action';
 
-    protected array $options = [];
+    protected array | Arrayable $options = [];
 
     protected ?string $placeholder = null;
 
-    public function options(array $options): static
+    public function options(array | Arrayable $options): static
     {
         $this->options = $options;
 
@@ -28,7 +30,13 @@ public function placeholder(string $placeholder): static
 
     public function getOptions(): array
     {
-        return $this->options;
+        $options = $this->options;
+
+        if ($options instanceof Arrayable) {
+            $options = $options->toArray();
+        }
+
+        return $options;
     }
 
     public function getPlaceholder(): ?string

diff --git a/src/Resources/RelationManagers/BelongsToManyRelationManager.php b/src/Resources/RelationManagers/BelongsToManyRelationManager.php
@@ -3,6 +3,7 @@
 namespace Filament\Resources\RelationManagers;
 
 use Filament\Resources\Table;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Arr;
 
 class BelongsToManyRelationManager extends RelationManager
@@ -89,4 +90,10 @@ protected function save(): void
 
         $this->callHook('afterSave');
     }
+
+    // https://github.com/laravel/framework/issues/4962
+    public function applySelectToTableQuery(Builder $query): Builder
+    {
+        return $query->select($this->getRelationship()->getTable().'.*', $query->getModel()->getTable().'.*');
+    }
 }