fix FilterSelect applying

contributte · Jun 6, 2022 · 359aedf · 359aedf
1 parent e7b0ceb
commit 359aedf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/DataSource/ArrayDataSource.php b/src/DataSource/ArrayDataSource.php
@@ -15,6 +15,7 @@
 use Ublaboo\DataGrid\Filter\FilterDateRange;
 use Ublaboo\DataGrid\Filter\FilterMultiSelect;
 use Ublaboo\DataGrid\Filter\FilterRange;
+use Ublaboo\DataGrid\Filter\FilterSelect;
 use Ublaboo\DataGrid\Filter\FilterText;
 use Ublaboo\DataGrid\Utils\DateTimeHelper;
 use Ublaboo\DataGrid\Utils\Sorting;
@@ -196,6 +197,10 @@ protected function applyFilter($row, Filter $filter)
 				$value = (string) $value;
 				$rowVal = (string) $row[$column];
 
+				if ($filter instanceof FilterSelect) {
+					return $rowVal === $value;
+				}
+
 				if ($filter instanceof FilterText && $filter->isExactSearch()) {
 					return $rowVal === $value;
 				}

diff --git a/tests/Cases/DataSources/BaseDataSourceTest.phpt b/tests/Cases/DataSources/BaseDataSourceTest.phpt
@@ -188,6 +188,16 @@ abstract class BaseDataSourceTest extends TestCase
 		], $result);
 	}
 
+	public function testFilterSelect(): void
+	{
+		$filter = new Ublaboo\DataGrid\Filter\FilterSelect($this->grid, 'a', 'b', ['John Red' => 'John Red'], 'name');
+		$filter->setValue('John Red');
+
+		$this->ds->filter([$filter]);
+
+		Assert::equal([$this->data[5]], $this->getActualResultAsArray());
+	}
+
 
 	protected function getActualResultAsArray()
 	{