filter search fix

.gitignore

@@ -1,3 +1,4 @@
 .idea
 .env
-vendor
+vendor
+composer.lock

composer.json

@@ -2,7 +2,7 @@
     "name": "itguild/eloquent-table",
     "type": "library",
     "require": {
-        "itguild/tables": "^0.1.9"
+        "itguild/tables": "^1.0"
     },
     "require-dev": {
         "illuminate/database": "^12.0@dev",

index.php

@@ -44,16 +44,28 @@ try {
         'currentPage' => 1,
         'perPage' => 3,
         'params' => ["class" => "table table-bordered", "border" => "2"],
-        'baseUrl' => "/admin/user"
+        'baseUrl' => "",
+        'searchPrefix' => '',
+        'searchParams' => $_GET,
+        'filters' => ["email"]
     ]));
     $table->columns([
-        'created_at' => function ($data) {
-            if (!$data){
-                return null;
-            }
-
-            return (new DateTimeImmutable($data))->format("d-m-Y");
-        },
+        'username' => [
+            'filter' => [
+                'class' => \Itguild\Tables\Filter\InputTextFilter::class
+            ]
+        ],
+        'role' => [
+            'filter' => [
+                'class' => \Itguild\Tables\Filter\InputTextFilter::class
+            ],
+        ],
+        'created_at' => [
+            'format' => 'date:d-m-Y',
+            'filter' => [
+                'class' => \Itguild\Tables\Filter\InputDateFilter::class
+            ]
+        ],
         'updated_at' => function ($data) {
             if (!$data){
                 return null;

src/EloquentDataProvider.php

@@ -4,6 +4,8 @@ namespace Itguild\EloquentTable;
 
 use Exception;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\App;
+use itguild\forms\debug\Debug;
 
 class EloquentDataProvider
 {
@@ -19,6 +21,7 @@ class EloquentDataProvider
 
     protected array $options = [];
     protected array $meta = [];
+    protected array $filters = [];
     protected string $jsonStr = '';
 
     /**
@@ -46,14 +49,28 @@ class EloquentDataProvider
         $this->meta['baseUrl'] = $options['baseUrl'] ?? $model->table;
         $this->meta['params'] = $options['params'] ?? [];
         $this->meta['actions'] = $options['actions'] ?? [];
+        $this->meta['searchPrefix'] = $options['searchPrefix'] ?? '/search';
+        $this->meta['searchParams'] = $options['searchParams'] ?? [];
+        $this->meta['showFiltersRow'] = $options['showFiltersRow'] ?? true;
+        $this->filters = $options['filters'] ?? [];
         $this->createQuery();
-
-        $this->jsonStr = (new JSONCreator($this->meta, $this->getCollection()->toArray()))->getJson();
-
+        $this->jsonStr = (new JSONCreator($this->meta, $this->getCollection()->toArray(), $this->filters,))->getJson();
     }
 
     public function createQuery(): void
     {
+        if ($this->meta['searchParams']){
+            foreach ($this->meta['searchParams'] as $name => $param){
+                if (array_key_exists($name, $this->meta['columns']) && !empty($param)){
+                    if (is_numeric($param)){
+                        $this->queryBuilder->where($name, $this->meta['searchParams'][$name]);
+                    }
+                    elseif (is_string($param)){
+                        $this->queryBuilder->where($name,'like', '%' . $param. '%');
+                    }
+                }
+            }
+        }
         if ($this->currentPage > 1) {
             $this->queryBuilder->skip(($this->currentPage - 1) * $this->perPage)->take($this->perPage);
         } else {

src/JSONCreator.php

@@ -7,12 +7,13 @@ class JSONCreator
 {
     protected array $informationArray = [];
 
-    public function __construct(array $meta, array $data)
+    public function __construct(array $meta, array $data, array $filters = [])
     {
         $params = empty($meta['params']) ? ["class" => "table table-bordered", "border" => "1"] : $meta['params'];
         if ($meta) {
             $this->informationArray = [
                 "meta" => $meta,
+                "filters" => $filters,
                 "data" => $data ?? []
             ];
         }

src/models/User.php

@@ -21,7 +21,8 @@ class User extends Model {
             'username' => 'Логин',
             'email' => 'Email',
             'created_at' => 'Создан',
-            'updated_at' => 'Обновлен'
+            'updated_at' => 'Обновлен',
+            'role' => 'Роль'
         ];
     }
 }