Merge branch 'yajra:master' into master

Author: affaron

CHANGELOG.md

@@ -8,6 +8,19 @@
 
 ### [Unreleased]
 
+### [v10.6.0] - 2023-06-29
+
+- feat: Expose autoFilter setter to disable post filtering #2981
+ 
+### [v10.5.0] - 2023-06-29
+
+- feat: Prevent editColumn when column is not shown #3018
+
+### [v10.4.4] - 2023-06-27
+
+- feat: Optimize countQuery with complex select #3008
+- fix: phpstan #3022
+
 ### [v10.4.3] - 2023-06-07
 
 - Fix: Prevent the filteredCount() query if no filter is applied to the initial query #3007
@@ -130,7 +143,10 @@
 - Drop support for `ApiResourceDataTable`
 - PHP8 syntax / method signature changed
 
-[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v10.3.1...10.x
+[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v10.6.0...10.x
+[v10.6.0]: https://github.com/yajra/laravel-datatables/compare/v10.6.0...v10.5.0
+[v10.5.0]: https://github.com/yajra/laravel-datatables/compare/v10.5.0...v10.4.4
+[v10.4.4]: https://github.com/yajra/laravel-datatables/compare/v10.4.4...v10.4.3
 [v10.3.1]: https://github.com/yajra/laravel-datatables/compare/v10.3.1...v10.3.0
 [v10.3.1]: https://github.com/yajra/laravel-datatables/compare/v10.3.1...v10.3.0
 [v10.3.0]: https://github.com/yajra/laravel-datatables/compare/v10.3.0...v10.2.3

phpstan.neon.dist

@@ -10,6 +10,7 @@ parameters:
 
     ignoreErrors:
         - '#Unsafe usage of new static\(\).#'
+        - '#Negated boolean expression is always false.#'
 
     excludePaths:
         - src/helper.php

src/DataTableAbstract.php

@@ -52,13 +52,13 @@ abstract class DataTableAbstract implements DataTable
      * @var array
      */
     protected array $columnDef = [
-        'index' => false,
-        'append' => [],
-        'edit' => [],
-        'filter' => [],
-        'order' => [],
-        'only' => null,
-        'hidden' => [],
+        'index'   => false,
+        'append'  => [],
+        'edit'    => [],
+        'filter'  => [],
+        'order'   => [],
+        'only'    => null,
+        'hidden'  => [],
         'visible' => [],
     ];
 
@@ -103,10 +103,10 @@ abstract class DataTableAbstract implements DataTable
      * @var array
      */
     protected array $templates = [
-        'DT_RowId' => '',
+        'DT_RowId'    => '',
         'DT_RowClass' => '',
-        'DT_RowData' => [],
-        'DT_RowAttr' => [],
+        'DT_RowData'  => [],
+        'DT_RowAttr'  => [],
     ];
 
     /**
@@ -147,6 +147,8 @@ abstract class DataTableAbstract implements DataTable
 
     protected mixed $transformer;
 
+    protected bool $editOnlySelectedColumns = false;
+
     /**
      * Can the DataTable engine be created with these parameters.
      *
@@ -231,7 +233,13 @@ public function addIndexColumn(): static
      */
     public function editColumn($name, $content): static
     {
-        $this->columnDef['edit'][] = ['name' => $name, 'content' => $content];
+        if ($this->editOnlySelectedColumns) {
+            if (! count($this->request->columns()) || in_array($name, Arr::pluck($this->request->columns(), 'name'))) {
+                $this->columnDef['edit'][] = ['name' => $name, 'content' => $content];
+            }
+        } else {
+            $this->columnDef['edit'][] = ['name' => $name, 'content' => $content];
+        }
 
         return $this;
     }
@@ -584,6 +592,18 @@ public function skipPaging(): static
         return $this;
     }
 
+    /**
+     * Skip auto filtering as needed.
+     *
+     * @return $this
+     */
+    public function skipAutoFilter(): static
+    {
+        $this->autoFilter = false;
+
+        return $this;
+    }
+
     /**
      * Push a new column name to blacklist.
      *
@@ -867,10 +887,10 @@ protected function processResults($results, $object = false): array
     protected function render(array $data): JsonResponse
     {
         $output = $this->attachAppends([
-            'draw' => $this->request->draw(),
-            'recordsTotal' => $this->totalRecords,
+            'draw'            => $this->request->draw(),
+            'recordsTotal'    => $this->totalRecords,
             'recordsFiltered' => $this->filteredRecords ?? 0,
-            'data' => $data,
+            'data'            => $data,
         ]);
 
         if ($this->config->isDebugging()) {
@@ -934,11 +954,11 @@ protected function errorResponse(\Exception $exception)
         $this->getLogger()->error($exception);
 
         return new JsonResponse([
-            'draw' => $this->request->draw(),
-            'recordsTotal' => $this->totalRecords,
+            'draw'            => $this->request->draw(),
+            'recordsTotal'    => $this->totalRecords,
             'recordsFiltered' => 0,
-            'data' => [],
-            'error' => $error ? __($error) : "Exception Message:\n\n".$exception->getMessage(),
+            'data'            => [],
+            'error'           => $error ? __($error) : "Exception Message:\n\n".$exception->getMessage(),
         ]);
     }
 
@@ -1039,4 +1059,11 @@ protected function getPrimaryKeyName(): string
     {
         return 'id';
     }
+
+    public function editOnlySelectedColumns(): static
+    {
+        $this->editOnlySelectedColumns = true;
+
+        return $this;
+    }
 }

src/QueryDataTable.php

@@ -8,6 +8,7 @@
 use Illuminate\Database\Query\Expression;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 use Yajra\DataTables\Utilities\Helper;
 
@@ -48,6 +49,13 @@ class QueryDataTable extends DataTableAbstract
      */
     protected bool $keepSelectBindings = false;
 
+    /**
+     * Flag to ignore the selects in count query.
+     *
+     * @var bool
+     */
+    protected bool $ignoreSelectInCountQuery = false;
+
     /**
      * @param  QueryBuilder  $builder
      */
@@ -156,10 +164,20 @@ public function prepareCountQuery(): QueryBuilder
         $builder = clone $this->query;
 
         if ($this->isComplexQuery($builder)) {
+            $builder->select(DB::raw('1'));
+            if ($this->ignoreSelectInCountQuery || ! $this->isComplexQuery($builder)) {
+                return $this->getConnection()
+                    ->query()
+                    ->fromRaw('('.$builder->toSql().') count_row_table')
+                    ->setBindings($builder->getBindings());
+            }
+
+            $builder = clone $this->query;
+
             return $this->getConnection()
-                        ->query()
-                        ->fromRaw('('.$builder->toSql().') count_row_table')
-                        ->setBindings($builder->getBindings());
+                ->query()
+                ->fromRaw('('.$builder->toSql().') count_row_table')
+                ->setBindings($builder->getBindings());
         }
 
         $row_count = $this->wrap('row_count');
@@ -819,4 +837,16 @@ public function getFilteredQuery(): QueryBuilder
 
         return $this->getQuery();
     }
+
+   /**
+    * Ignore the selects in count query.
+    *
+    * @return $this
+    */
+   public function ignoreSelectsInCountQuery(): static
+   {
+       $this->ignoreSelectInCountQuery = true;
+
+       return $this;
+   }
 }

src/Utilities/Request.php

@@ -254,7 +254,9 @@ public function getBaseRequest(): BaseRequest
      */
     public function start(): int
     {
-        return intval($this->request->input('start', 0));
+        $start = $this->request->input('start', 0);
+
+        return is_numeric($start) ? intval($start) : 0;
     }
 
     /**
@@ -264,7 +266,9 @@ public function start(): int
      */
     public function length(): int
     {
-        return intval($this->request->input('length', 10));
+        $length = $this->request->input('length', 10);
+
+        return is_numeric($length) ? intval($length) : 10;
     }
 
     /**
@@ -274,6 +278,8 @@ public function length(): int
      */
     public function draw(): int
     {
-        return intval($this->request->input('draw', 0));
+        $draw = $this->request->input('draw', 0);
+
+        return is_numeric($draw) ? intval($draw) : 0;
     }
 }