Merge remote-tracking branch 'upstream/master' into ignore_getters

Author: Arkhas

CHANGELOG.md

@@ -8,6 +8,23 @@
 
 ### [Unreleased]
 
+### [v10.6.2] - 2023-07-15
+
+- fix: #3010 - convert expressions to strings #3029
+
+### [v10.6.1] - 2023-07-05
+
+- fix: #3025 #3026
+- fix the error introduced in 10.4.4 as described in #3025.
+
+### [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
@@ -135,7 +152,11 @@
 - Drop support for `ApiResourceDataTable`
 - PHP8 syntax / method signature changed
 
-[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v10.4.4...10.x
+[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v10.6.2...10.x
+[v10.6.2]: https://github.com/yajra/laravel-datatables/compare/v10.6.2...v10.6.1
+[v10.6.1]: https://github.com/yajra/laravel-datatables/compare/v10.6.1...v10.6.0
+[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

src/DataTableAbstract.php

@@ -104,10 +104,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'  => [],
     ];
 
     /**
@@ -148,6 +148,8 @@ abstract class DataTableAbstract implements DataTable
 
     protected mixed $transformer;
 
+    protected bool $editOnlySelectedColumns = false;
+
     /**
      * Can the DataTable engine be created with these parameters.
      *
@@ -245,7 +247,13 @@ public function ignoreGetters(): 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;
     }
@@ -598,6 +606,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.
      *
@@ -881,10 +901,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()) {
@@ -948,11 +968,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(),
         ]);
     }
 
@@ -1053,4 +1073,11 @@ protected function getPrimaryKeyName(): string
     {
         return 'id';
     }
+
+    public function editOnlySelectedColumns(): static
+    {
+        $this->editOnlySelectedColumns = true;
+
+        return $this;
+    }
 }

src/QueryDataTable.php

@@ -164,7 +164,7 @@ public function prepareCountQuery(): QueryBuilder
         $builder = clone $this->query;
 
         if ($this->isComplexQuery($builder)) {
-            $builder->select(DB::raw('1'));
+            $builder->select(DB::raw('1 as dt_row_count'));
             if ($this->ignoreSelectInCountQuery || ! $this->isComplexQuery($builder)) {
                 return $this->getConnection()
                     ->query()
@@ -311,6 +311,19 @@ protected function getColumnSearchKeyword(int $i, bool $raw = false): string
         return $this->setupKeyword($keyword);
     }
 
+    protected function getColumnNameByIndex(int $index): string
+    {
+        $name = (isset($this->columns[$index]) && $this->columns[$index] != '*')
+            ? $this->columns[$index]
+            : $this->getPrimaryKeyName();
+
+        if ($name instanceof Expression) {
+            $name = $name->getValue($this->query->getGrammar());
+        }
+
+        return in_array($name, $this->extraColumns, true) ? $this->getPrimaryKeyName() : $name;
+    }
+
     /**
      * Apply filterColumn api search.
      *