This pull request fixes per-column searches. (#120)

* This rest of the logic shall be in search criteria.

* Use filter only if is set. Operator from column definition.

* Fix filter type inconsistency.

Author: vaibhavpandeyvpz

src/Adapter/Doctrine/ORM/SearchCriteriaProvider.php

@@ -40,9 +40,14 @@ private function processSearchColumns(QueryBuilder $queryBuilder, DataTableState
             $column = $searchInfo['column'];
             $search = $searchInfo['search'];
 
-            if ('' !== trim($search) && null !== ($filter = $column->getFilter())) {
+            if ('' !== trim($search)) {
+                if (null !== ($filter = $column->getFilter())) {
+                    if (!$filter->isValidValue($search)) {
+                        continue;
+                    }
+                }
                 $search = $queryBuilder->expr()->literal($search);
-                $queryBuilder->andWhere(new Comparison($column->getField(), $filter->getOperator(), $search));
+                $queryBuilder->andWhere(new Comparison($column->getField(), $column->getOperator(), $search));
             }
         }
     }

src/Column/AbstractColumn.php

@@ -129,7 +129,7 @@ protected function configureOptions(OptionsResolver $resolver)
             ->setAllowedTypes('orderField', ['null', 'string'])
             ->setAllowedTypes('searchable', ['null', 'boolean'])
             ->setAllowedTypes('globalSearchable', ['null', 'boolean'])
-            ->setAllowedTypes('filter', ['null', 'array'])
+            ->setAllowedTypes('filter', ['null', AbstractFilter::class])
             ->setAllowedTypes('className', ['null', 'string'])
             ->setAllowedTypes('render', ['null', 'string', 'callable'])
             ->setAllowedTypes('operator', ['string'])

src/DataTableState.php

@@ -115,7 +115,7 @@ private function handleSearch(ParameterBag $parameters)
             $column = $this->dataTable->getColumn((int) $key);
             $value = $this->isInitial ? $search : $search['search']['value'];
 
-            if ($column->isSearchable() && '' !== trim($value) && null !== $column->getFilter() && $column->getFilter()->isValidValue($value)) {
+            if ($column->isSearchable() && ('' !== trim($value))) {
                 $this->setColumnSearch($column, $value);
             }
         }