Fix URL parameter handling for filtering and perPage changes (issue #…

src/Datagrid.php

@@ -1383,7 +1383,14 @@ public function filterSucceeded(NetteForm $form): void
 		}
 
 		$storedFilters = $this->getStorageData('_grid_filters', []);
+		$hasNonEmptyFilter = false;
+
 		foreach ($values as $key => $value) {
+			/**
+			 * Check if value is empty
+			 */
+			$isEmpty = is_iterable($value) ? ArraysHelper::testEmpty($value) : $value === '' || $value === null;
+
 			/**
 			 * Storage stuff
 			 */
@@ -1399,14 +1406,19 @@ public function filterSucceeded(NetteForm $form): void
 			$storedFilters[(string) $key] = $value;
 
 			/**
-			 * Other stuff
+			 * Only add non-empty filters to the persistent parameter
 			 */
-			$this->filter[$key] = $value;
+			if (!$isEmpty) {
+				$this->filter[$key] = $value;
+				$hasNonEmptyFilter = true;
+			} else {
+				unset($this->filter[$key]);
+			}
 		}
 
 		$this->saveStorageData('_grid_filters', $storedFilters);
 
-		if ($values->count() > 0) {
+		if ($hasNonEmptyFilter) {
 			$this->saveStorageData('_grid_has_filtered', 1);
 		}
 

tests/Cases/FilterTest.phpt

@@ -59,6 +59,57 @@ final class FilterTest extends TestCase
 		}, AbortException::class);
 	}
 
+	public function testEmptyFiltersAreNotAddedToPersistentParameter(): void
+	{
+		$factory = new TestingDatagridFactoryRouter();
+		/** @var Datagrid $grid */
+		$grid = $factory->createTestingDatagrid()->getComponent('grid');
+
+		// Add multiple filters
+		$grid->addFilterText('name', 'Name');
+		$grid->addFilterText('email', 'Email');
+		$grid->addFilterText('status', 'Status');
+
+		$filterForm = $grid->createComponentFilter();
+
+		// Set only some filters with values
+		$filterForm['filter']['name']->setValue('John');
+		$filterForm['filter']['email']->setValue(''); // Empty value
+		$filterForm['filter']['status']->setValue(null); // Null value
+
+		Assert::exception(function () use ($grid, $filterForm): void {
+			$grid->filterSucceeded($filterForm);
+		}, AbortException::class);
+
+		Assert::count(1, $grid->filter);
+		Assert::true(isset($grid->filter['name']));
+		Assert::equal('John', $grid->filter['name']);
+		Assert::false(isset($grid->filter['email']));
+		Assert::false(isset($grid->filter['status']));
+	}
+
+	public function testAllEmptyFiltersResultInNoFilterPersistence(): void
+	{
+		$factory = new TestingDatagridFactoryRouter();
+		/** @var Datagrid $grid */
+		$grid = $factory->createTestingDatagrid()->getComponent('grid');
+
+		$grid->addFilterText('name', 'Name');
+		$grid->addFilterText('email', 'Email');
+
+		$filterForm = $grid->createComponentFilter();
+
+		// Set all filters to empty values
+		$filterForm['filter']['name']->setValue('');
+		$filterForm['filter']['email']->setValue('');
+
+		Assert::exception(function () use ($grid, $filterForm): void {
+			$grid->filterSucceeded($filterForm);
+		}, AbortException::class);
+
+		Assert::count(0, $grid->filter);
+	}
+
 }
 
 (new FilterTest())->run();