Feature - Add scout searching to pages with searchable models. (#1445)

Co-authored-by: Glenn Jacobs <glenn@neondigital.co.uk>
lunarphp · Jan 4, 2024 · 418541e · 418541e
1 parent 92ebaa4
commit 418541e
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 2 deletions.
diff --git a/packages/admin/config/search.php b/packages/admin/config/search.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Enable Scout when searching on supported models.
+    |--------------------------------------------------------------------------
+    |
+    | Some models in the core have Scout implemented as a search driver, if you
+    | want to use Scout when possible on tables in the panel, enable it here.
+    |
+    */
+    'scout_enabled' => true,
+];
diff --git a/packages/admin/src/Filament/Resources/BrandResource.php b/packages/admin/src/Filament/Resources/BrandResource.php
@@ -82,7 +82,7 @@ public static function getDefaultTable(Table $table): Table
                 Tables\Actions\BulkActionGroup::make([
                     Tables\Actions\DeleteBulkAction::make(),
                 ]),
-            ]);
+            ])->searchable();
     }
 
     protected static function getTableColumns(): array

diff --git a/packages/admin/src/Filament/Resources/OrderResource/Pages/ListOrders.php b/packages/admin/src/Filament/Resources/OrderResource/Pages/ListOrders.php
@@ -2,7 +2,6 @@
 
 namespace Lunar\Admin\Filament\Resources\OrderResource\Pages;
 
-use Filament\Actions;
 use Filament\Resources\Components\Tab;
 use Illuminate\Contracts\Pagination\Paginator;
 use Illuminate\Database\Eloquent\Builder;

diff --git a/packages/admin/src/Filament/Resources/ProductOptionResource.php b/packages/admin/src/Filament/Resources/ProductOptionResource.php
@@ -111,6 +111,7 @@ public static function getDefaultTable(Table $table): Table
                     Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ])
+            ->searchable()
             ->defaultSort('position', 'asc')
             ->reorderable('position');
     }

diff --git a/packages/admin/src/LunarPanelProvider.php b/packages/admin/src/LunarPanelProvider.php
@@ -22,6 +22,12 @@
 
 class LunarPanelProvider extends ServiceProvider
 {
+    protected $configFiles = [
+        'search',
+    ];
+
+    protected $root = __DIR__.'/..';
+
     public function register(): void
     {
         $this->app->scoped('lunar-panel', function (): LunarPanelManager {
@@ -54,6 +60,10 @@ public function boot(): void
             __DIR__.'/../resources/lang' => $this->app->langPath('vendor/lunarpanel'),
         ]);
 
+        collect($this->configFiles)->each(function ($config) {
+            $this->mergeConfigFrom("{$this->root}/config/$config.php", "lunar.$config");
+        });
+
         $this->publishes([
             __DIR__.'/../public' => public_path('vendor/lunarpanel'),
         ], 'public');

diff --git a/packages/admin/src/Support/Pages/BaseListRecords.php b/packages/admin/src/Support/Pages/BaseListRecords.php
@@ -3,9 +3,38 @@
 namespace Lunar\Admin\Support\Pages;
 
 use Filament\Resources\Pages\ListRecords;
+use Illuminate\Database\Eloquent\Builder;
+use Lunar\Base\Traits\Searchable;
 
 abstract class BaseListRecords extends ListRecords
 {
     use Concerns\ExtendsHeaderActions;
     use \Lunar\Admin\Support\Concerns\CallsHooks;
+
+    protected function applySearchToTableQuery(Builder $query): Builder
+    {
+        $scoutEnabled = config('lunar.search.scout_enabled', false);
+        $isScoutSearchable = in_array(Searchable::class, class_uses_recursive(static::getModel()));
+
+        $this->applyColumnSearchesToTableQuery($query);
+
+        if (! $scoutEnabled || ! $isScoutSearchable) {
+            $this->applyGlobalSearchToTableQuery($query);
+        }
+
+        if (
+            filled($search = $this->getTableSearch()) &&
+            $scoutEnabled &&
+            $isScoutSearchable
+        ) {
+            $query->whereIn(
+                'id',
+                collect(static::getModel()::search($search)->keys())->map(
+                    fn ($result) => str_replace(static::getModel().'::', '', $result)
+                )
+            );
+        }
+
+        return $query;
+    }
 }
diff --git a/packages/core/src/Search/ScoutIndexer.php b/packages/core/src/Search/ScoutIndexer.php
@@ -73,6 +73,10 @@ protected function mapSearchableAttributes(Model $model): array
 
         $attributeData = $model->attribute_data;
 
+        if (! $attributeData) {
+            return [];
+        }
+
         $data = [];
 
         foreach ($attributes as $attribute) {