Merge pull request #3007 from Arkhas/master

Prevent the filteredCount() query if no filter is applied to the initial query

Author: hpacleb

src/QueryDataTable.php

@@ -205,6 +205,35 @@ public function keepSelectBindings(): static
         return $this;
     }
 
+    /**
+     * Perform column search.
+     *
+     * @return void
+     */
+    protected function filterRecords(): void
+    {
+        $initialQuery = clone $this->query;
+
+        if ($this->autoFilter && $this->request->isSearchable()) {
+            $this->filtering();
+        }
+
+        if (is_callable($this->filterCallback)) {
+            call_user_func($this->filterCallback, $this->resolveCallbackParameter());
+        }
+
+        $this->columnSearch();
+        $this->searchPanesSearch();
+
+        // If no modification between the original query and the filtered one has been made
+        // the filteredRecords equals the totalRecords
+        if ($this->query == $initialQuery) {
+            $this->filteredRecords ??= $this->totalRecords;
+        } else {
+            $this->filteredCount();
+        }
+    }
+
     /**
      * Perform column search.
      *

tests/Integration/QueryDataTableTest.php

@@ -25,7 +25,7 @@ public function it_can_set_total_records()
         $crawler->assertJson([
             'draw' => 0,
             'recordsTotal' => 10,
-            'recordsFiltered' => 20,
+            'recordsFiltered' => 10,
         ]);
     }
 
@@ -36,7 +36,7 @@ public function it_can_set_zero_total_records()
         $crawler->assertJson([
             'draw' => 0,
             'recordsTotal' => 0,
-            'recordsFiltered' => 20,
+            'recordsFiltered' => 0,
         ]);
     }