Additional fix & test for zero total records.

yajra · May 8, 2022 · 2c70c6a · 2c70c6a
1 parent 2b72d19
commit 2c70c6a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/DataTableAbstract.php b/src/DataTableAbstract.php
@@ -539,7 +539,6 @@ public function setMultiTerm(bool $multiTerm = true): static
      */
     public function setTotalRecords(int $total): static
     {
-        $this->skipTotalRecords();
         $this->totalRecords = $total;
 
         return $this;

diff --git a/src/QueryDataTable.php b/src/QueryDataTable.php
@@ -116,11 +116,9 @@ protected function prepareQuery(): static
         if (! $this->prepared) {
             $this->totalRecords = $this->totalCount();
 
-            if ($this->totalRecords) {
-                $this->filterRecords();
-                $this->ordering();
-                $this->paginate();
-            }
+            $this->filterRecords();
+            $this->ordering();
+            $this->paginate();
         }
 
         $this->prepared = true;

diff --git a/tests/Integration/QueryDataTableTest.php b/tests/Integration/QueryDataTableTest.php
@@ -29,6 +29,17 @@ public function it_can_set_total_records()
         ]);
     }
 
+    /** @test */
+    public function it_can_set_zero_total_records()
+    {
+        $crawler = $this->call('GET', '/zero-total-records');
+        $crawler->assertJson([
+            'draw' => 0,
+            'recordsTotal' => 0,
+            'recordsFiltered' => 20,
+        ]);
+    }
+
     /** @test */
     public function it_can_set_total_filtered_records()
     {
@@ -83,7 +94,7 @@ public function it_can_skip_total_records_count_query()
         $crawler->assertJson([
             'draw' => 0,
             'recordsTotal' => 0,
-            'recordsFiltered' => 0,
+            'recordsFiltered' => 1,
         ]);
     }
 
@@ -429,6 +440,12 @@ protected function setUp(): void
                              ->toJson();
         });
 
+        $router->get('/zero-total-records', function (DataTables $dataTable) {
+            return $dataTable->query(DB::table('users'))
+                             ->setTotalRecords(0)
+                             ->toJson();
+        });
+
         $router->get('/set-filtered-records', function (DataTables $dataTable) {
             return $dataTable->query(DB::table('users'))
                              ->setFilteredRecords(10)