fix: errors when disabling filtering on data table types with filters…

… defined
Kreyu · Jun 15, 2023 · 26ad423 · 26ad423
1 parent 2dde783
commit 26ad423
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/DataTable.php b/src/DataTable.php
@@ -228,7 +228,7 @@ public function getPaginationData(): PaginationData
         return $this->paginationData;
     }
 
-    public function getFiltrationData(): FiltrationData
+    public function getFiltrationData(): ?FiltrationData
     {
         return $this->filtrationData;
     }
@@ -308,7 +308,7 @@ public function isExporting(): bool
 
     public function hasActiveFilters(): bool
     {
-        return $this->filtrationData->hasActiveFilters();
+        return (bool) $this->filtrationData?->hasActiveFilters();
     }
 
     public function handleRequest(mixed $request): void

diff --git a/src/DataTableInterface.php b/src/DataTableInterface.php
@@ -35,7 +35,7 @@ public function getSortingData(): SortingData;
 
     public function getPaginationData(): PaginationData;
 
-    public function getFiltrationData(): FiltrationData;
+    public function getFiltrationData(): ?FiltrationData;
 
     public function getPersonalizationData(): PersonalizationData;
 

diff --git a/src/Type/DataTableType.php b/src/Type/DataTableType.php
@@ -229,6 +229,10 @@ private function createFilterViews(DataTableView $view, DataTableInterface $data
     {
         $filters = [];
 
+        if (!$dataTable->getConfig()->isFiltrationEnabled()) {
+            return [];
+        }
+
         foreach ($dataTable->getConfig()->getFilters() as $filter) {
             $data = $dataTable->getFiltrationData()->getFilterData($filter->getName()) ?? new FilterData();