Merge branch 'develop' into fix/postgres-search

filamentphp · Mar 11, 2021 · 1eb3719 · 1eb3719
2 parents 9603dd8 + dcd7cfc
commit 1eb3719
Show file tree

Hide file tree

Showing 18 changed files with 188 additions and 196 deletions.
diff --git a/packages/forms/resources/views/components/file-upload.blade.php b/packages/forms/resources/views/components/file-upload.blade.php
@@ -61,7 +61,7 @@
             FilePond.registerPlugin(FilePondPluginImageTransform)
 
             let config = {
-                acceptedFileTypes: @json($formComponent->acceptedFileTypes),
+                acceptedFileTypes: {{ json_encode($formComponent->acceptedFileTypes) }},
                 files: [],
                 {{ $formComponent->imageCropAspectRatio !== null ? "imageCropAspectRatio: '{$formComponent->imageCropAspectRatio}'," : null }}
                 {{ $formComponent->imagePreviewHeight !== null ? "imagePreviewHeight: {$formComponent->imagePreviewHeight}," : null }}

diff --git a/packages/tables/resources/views/cells/icon.blade.php b/packages/tables/resources/views/cells/icon.blade.php
@@ -13,19 +13,19 @@
 @endphp
 
 @if ($iconToShow)
-    @if ($column->action)
+    @if ($column->getAction($record) !== null)
         <button
-            wire:click="{{ $column->action }}('{{ $record->getKey() }}')"
+            wire:click="{{ $column->getAction($record) }}('{{ $record->getKey() }}')"
             type="button"
         >
             <x-dynamic-component :component="$iconToShow" class="{{ $classes ?? null }} w-6 h-6" />
         </button>
-    @elseif ($column->url)
+    @elseif ($column->getUrl($record) !== null)
         <a
             href="{{ $column->getUrl($record) }}"
             @if ($column->shouldOpenUrlInNewTab)
-            target="_blank"
-            rel="noopener noreferrer"
+                target="_blank"
+                rel="noopener noreferrer"
             @endif
         >
             <x-dynamic-component :component="$iconToShow" class="{{ $classes ?? null }} w-6 h-6" />

diff --git a/packages/tables/resources/views/cells/image.blade.php b/packages/tables/resources/views/cells/image.blade.php
@@ -1,6 +1,6 @@
-@if ($column->action)
+@if ($column->getAction($record) !== null)
     <button
-        wire:click="{{ $column->action }}('{{ $record->getKey() }}')"
+        wire:click="{{ $column->getAction($record) }}('{{ $record->getKey() }}')"
         type="button"
     >
         <img
@@ -12,7 +12,7 @@ class="{{ $column->rounded ? 'rounded-full' : null }}"
             "
         />
     </button>
-@elseif ($column->url)
+@elseif ($column->getUrl($record) !== null)
     <a
         href="{{ $column->getUrl($record) }}"
         @if ($column->shouldOpenUrlInNewTab)

diff --git a/packages/tables/resources/views/cells/text.blade.php b/packages/tables/resources/views/cells/text.blade.php
@@ -3,15 +3,15 @@
 @endphp
 
 <div class="py-4">
-    @if ($column->action)
+    @if ($column->getAction($record) !== null)
         <button
-            wire:click="{{ $column->action }}('{{ $record->getKey() }}')"
+            wire:click="{{ $column->getAction($record) }}('{{ $record->getKey() }}')"
             type="button"
             class="{{ $primaryClasses }} hover:underline hover:text-primary-600 transition-colors duration-200"
         >
             {{ $column->getValue($record) }}
         </button>
-    @elseif ($column->url)
+    @elseif ($column->getUrl($record) !== null)
         <a
             href="{{ $column->getUrl($record) }}"
             class="{{ $primaryClasses }} hover:underline hover:text-primary-600 transition-colors duration-200"

diff --git a/packages/tables/src/Columns/Concerns/CanCallAction.php b/packages/tables/src/Columns/Concerns/CanCallAction.php
@@ -12,4 +12,17 @@ public function action($action)
 
         return $this;
     }
+
+    public function getAction($record)
+    {
+        if ($this->action === null) return null;
+
+        if (is_callable($this->action)) {
+            $callback = $this->action;
+
+            return $callback($record);
+        }
+
+        return $this->action;
+    }
 }
diff --git a/packages/tables/src/Columns/Concerns/CanOpenUrl.php b/packages/tables/src/Columns/Concerns/CanOpenUrl.php
@@ -10,6 +10,8 @@ trait CanOpenUrl
 
     public function getUrl($record)
     {
+        if ($this->url === null) return null;
+
         if (is_callable($this->url)) {
             $callback = $this->url;
 

diff --git a/packages/tables/src/Filter.php b/packages/tables/src/Filter.php
@@ -23,13 +23,23 @@ class Filter
 
     protected $pendingIncludedContextModifications = [];
 
-    public function __construct($name, $callback = null)
+    public function __construct($name = null, $callback = null)
     {
-        $this->name($name);
+        if ($name) {
+            $this->name($name);
+        }
+
         $this->callback($callback);
+
+        $this->setUp();
+    }
+
+    protected function setUp()
+    {
+        //
     }
 
-    public static function make($name, $callback = null)
+    public static function make($name = null, $callback = null)
     {
         return new static($name, $callback);
     }
@@ -41,6 +51,13 @@ public function callback($callback)
         return $this;
     }
 
+    public function apply($query)
+    {
+        $callback = $this->callback;
+
+        return $callback($query);
+    }
+
     public function context($context)
     {
         $this->context = $context;

diff --git a/packages/tables/src/HasTable.php b/packages/tables/src/HasTable.php
@@ -118,9 +118,7 @@ public function getRecords()
             collect($this->getTable()->filters)
                 ->filter(fn ($filter) => $filter->name === $this->filter)
                 ->each(function ($filter) use (&$query) {
-                    $callback = $filter->callback;
-
-                    $query = $callback($query);
+                    $query = $filter->apply($query);
                 });
         }
 

diff --git a/packages/tables/src/Table.php b/packages/tables/src/Table.php
@@ -12,6 +12,10 @@ class Table
 
     public $pagination = true;
 
+    public $primaryColumnAction;
+
+    public $primaryColumnUrl;
+
     public $recordActions = [];
 
     public $searchable = true;
@@ -138,6 +142,28 @@ public function pagination($enabled)
         return $this;
     }
 
+    public function primaryRecordAction($action)
+    {
+        $this->columns = collect($this->columns)
+            ->map(function ($column) use ($action) {
+                return $column->action($action);
+            })
+            ->toArray();
+
+        return $this;
+    }
+
+    public function primaryRecordUrl($url)
+    {
+        $this->columns = collect($this->columns)
+            ->map(function ($column) use ($url) {
+                return $column->url($url);
+            })
+            ->toArray();
+
+        return $this;
+    }
+
     public function recordActions($actions)
     {
         $this->recordActions = $actions;

diff --git a/src/Commands/Aliases/MakeFilterCommand.php b/src/Commands/Aliases/MakeFilterCommand.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Filament\Commands\Aliases;
+
+class MakeFilterCommand extends \Filament\Commands\MakeFilterCommand
+{
+    protected $signature = 'filament:filter {name} {--R|resource}';
+}
diff --git a/src/Commands/MakeFieldCommand.php b/src/Commands/MakeFieldCommand.php
@@ -33,7 +33,7 @@ public function handle()
 
         $path = app_path(
             (string) Str::of($field)
-                ->prepend($this->option('resource') ? 'Filament\\Resources\\Forms\\Components\\' : "Filament\\Forms\\Components\\")
+                ->prepend($this->option('resource') ? 'Filament\\Resources\\Forms\\Components\\' : 'Filament\\Forms\\Components\\')
                 ->replace('\\', '/')
                 ->append('.php'),
         );

diff --git a/src/Commands/MakeFilterCommand.php b/src/Commands/MakeFilterCommand.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Filament\Commands;
+
+use Illuminate\Support\Str;
+use Illuminate\Console\Command;
+
+class MakeFilterCommand extends Command
+{
+    use Concerns\CanManipulateFiles;
+
+    protected $description = 'Make a Filament filter class.';
+
+    protected $signature = 'make:filament-filter {name} {--R|resource}';
+
+    public function handle()
+    {
+        $filter = (string) Str::of($this->argument('name'))
+            ->trim('/')
+            ->trim('\\')
+            ->trim(' ')
+            ->replace('/', '\\');
+        $filterClass = (string) Str::of($filter)->afterLast('\\');
+        $filterNamespace = Str::of($filter)->contains('\\') ?
+            (string) Str::of($filter)->beforeLast('\\') :
+            '';
+
+        $path = app_path(
+            (string) Str::of($filter)
+                ->prepend($this->option('resource') ? 'Filament\\Resources\\Tables\\Filters\\' : 'Filament\\Tables\\Filters\\')
+                ->replace('\\', '/')
+                ->append('.php'),
+        );
+
+        if ($this->checkForCollision([
+            $path,
+        ])) return;
+
+        if (! $this->option('resource')) {
+            $this->copyStubToApp('Filter', $path, [
+                'class' => $filterClass,
+                'namespace' => 'App\\Filament\\Tables\\Filters' . ($filterNamespace !== '' ? "\\{$filterNamespace}" : ''),
+            ]);
+        } else {
+            $this->copyStubToApp('ResourceFilter', $path, [
+                'class' => $filterClass,
+                'namespace' => 'App\\Filament\\Resources\\Tables\\Filters' . ($filterNamespace !== '' ? "\\{$filterNamespace}" : ''),
+            ]);
+        }
+
+        $this->info("Successfully created {$filter}!");
+    }
+}
diff --git a/src/FilamentServiceProvider.php b/src/FilamentServiceProvider.php
@@ -34,6 +34,7 @@ public function boot()
         $this->bootLoaders();
         $this->bootLivewireComponents();
         $this->bootPublishing();
+
         $this->configure();
     }
 
@@ -65,6 +66,7 @@ protected function bootCommands()
             Commands\MakeWidgetCommand::class,
             Commands\MakeFieldCommand::class,
             Commands\MakeThemeCommand::class,
+            Commands\MakeFilterCommand::class,
         ]);
 
         $aliases = [];
@@ -195,9 +197,7 @@ protected function registerIcons()
 
     protected function registerProviders()
     {
-        $this->app->booted(function () {
-            $this->app->register(RouteServiceProvider::class);
-        });
+        $this->app->register(RouteServiceProvider::class);
     }
 
     protected function mergeConfigFrom($path, $key)

diff --git a/src/Resources/Pages/ListRecords.php b/src/Resources/Pages/ListRecords.php
@@ -80,6 +80,14 @@ public function getTable()
             ->context(static::class)
             ->filterable($this->filterable)
             ->pagination($this->pagination)
+            ->primaryRecordUrl(function ($record) {
+                if (! Filament::can('update', $record)) return;
+
+                return $this->getResource()::generateUrl(
+                    $this->recordRoute,
+                    ['record' => $record],
+                );
+            })
             ->recordActions([
                 RecordActions\Link::make('edit')
                     ->label(static::$editRecordActionLabel)

diff --git a/src/Resources/RelationManager.php b/src/Resources/RelationManager.php
@@ -166,6 +166,11 @@ public function getTable()
         return static::table(Table::make())
             ->filterable($this->filterable)
             ->pagination(false)
+            ->primaryRecordAction(function ($record) {
+                if (! Filament::can('update', $record)) return;
+
+                return 'openEdit';
+            })
             ->recordActions([
                 RecordActions\Link::make('edit')
                     ->label(static::$editRecordActionLabel)