Flush cached table records

filamentphp · Dec 6, 2023 · ffc0610 · ffc0610
1 parent d214638
commit ffc0610
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/packages/tables/src/Concerns/HasBulkActions.php b/packages/tables/src/Concerns/HasBulkActions.php
@@ -300,11 +300,11 @@ public function getAllSelectableTableRecordsCount(): int
         }
 
         if ($this->getTable()->selectsCurrentPageOnly()) {
-            return $this->records->count();
+            return $this->cachedTableRecords->count();
         }
 
-        if ($this->records instanceof LengthAwarePaginator) {
-            return $this->records->total();
+        if ($this->cachedTableRecords instanceof LengthAwarePaginator) {
+            return $this->cachedTableRecords->total();
         }
 
         return $this->getFilteredTableQuery()->count();

diff --git a/packages/tables/src/Concerns/HasRecords.php b/packages/tables/src/Concerns/HasRecords.php
@@ -19,7 +19,7 @@ trait HasRecords
      */
     protected bool $allowsDuplicates = false;
 
-    protected Collection | Paginator | CursorPaginator | null $records = null;
+    protected Collection | Paginator | CursorPaginator | null $cachedTableRecords = null;
 
     public function getFilteredTableQuery(): Builder
     {
@@ -84,8 +84,8 @@ public function getTableRecords(): Collection | Paginator | CursorPaginator
             $setRecordLocales = fn (Collection | Paginator | CursorPaginator $records): Collection | Paginator | CursorPaginator => $records;
         }
 
-        if ($this->records) {
-            return $setRecordLocales($this->records);
+        if ($this->cachedTableRecords) {
+            return $setRecordLocales($this->cachedTableRecords);
         }
 
         $query = $this->getFilteredSortedTableQuery();
@@ -94,10 +94,10 @@ public function getTableRecords(): Collection | Paginator | CursorPaginator
             (! $this->getTable()->isPaginated()) ||
             ($this->isTableReordering() && (! $this->getTable()->isPaginatedWhileReordering()))
         ) {
-            return $setRecordLocales($this->records = $this->hydratePivotRelationForTableRecords($query->get()));
+            return $setRecordLocales($this->cachedTableRecords = $this->hydratePivotRelationForTableRecords($query->get()));
         }
 
-        return $setRecordLocales($this->records = $this->hydratePivotRelationForTableRecords($this->paginateTableQuery($query)));
+        return $setRecordLocales($this->cachedTableRecords = $this->hydratePivotRelationForTableRecords($this->paginateTableQuery($query)));
     }
 
     protected function resolveTableRecord(?string $key): ?Model
@@ -159,13 +159,18 @@ public function getTableRecordKey(Model $record): string
 
     public function getAllTableRecordsCount(): int
     {
-        if ($this->records instanceof LengthAwarePaginator) {
-            return $this->records->total();
+        if ($this->cachedTableRecords instanceof LengthAwarePaginator) {
+            return $this->cachedTableRecords->total();
         }
 
         return $this->getFilteredTableQuery()->count();
     }
 
+    public function flushCachedTableRecords(): void
+    {
+        $this->cachedTableRecords = null;
+    }
+
     /**
      * @deprecated Override the `table()` method to configure the table.
      */

diff --git a/packages/tables/src/Concerns/InteractsWithTable.php b/packages/tables/src/Concerns/InteractsWithTable.php
@@ -310,5 +310,7 @@ public function resetTable(): void
         $this->resetTableFiltersForm();
 
         $this->resetPage();
+
+        $this->flushCachedTableRecords();
     }
 }