Merge pull request #6 from makoso/feature/allow-signle-field-filter

Hide filter type selector when only one is enabled

Author: makoso

Form/Type/FilterableType.php

@@ -35,7 +35,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     ];
                 },
                 'required' => false,
-                'placeholder' => 'Enable filtering'
+                'placeholder' => 'Enable filtering',
+                'data' => $filterGroup->getFilters()->count() === 1 ? $filterGroup->getFilters()->first() : null,
             ])
             ->add('value', $filterGroup->getFirstInputType(), $filterGroup->getFirstInputOptions())
             ->add('value2', $filterGroup->getSecondInputType(), $filterGroup->getSecondInputOptions())

Grid/Filter/SingleFieldSelectFilter.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Makoso\DatagridBundle\Grid\Filter;
+
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+
+final class SingleFieldSelectFilter extends FilterGroup
+{
+    public function __construct(array $choiceTypeOptions = [])
+    {
+        parent::__construct();
+        $this->getFilters()->add(new EqualFilter());
+
+        $this->setFirstInputType(ChoiceType::class);
+        $this->setFirstInputOptions($choiceTypeOptions);
+    }
+
+}

Grid/Filter/SingleFieldTextFilter.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Makoso\DatagridBundle\Grid\Filter;
+
+final class SingleFieldTextFilter extends FilterGroup
+{
+    public function __construct(FilterInterface $filter)
+    {
+        parent::__construct();
+        $this->filters->add($filter);
+    }
+
+}

Grid/Grid.php

@@ -276,7 +276,7 @@ private function processFilter()
             if ($column->isFilterable() && $column->getFilterGroup() != null) {
                 $filterData = $this->formData[self::GRID_FORM_FILTERABLE_KEY][$column->getName()];
 
-                if ($filterData['filterType'] instanceof FilterInterface) {
+                if ($filterData['filterType'] instanceof FilterInterface && (!empty($filterData['value']) || !empty($filterData['value2']))) {
                     $column->setFilterableValue(
                         [
                             'value'  => $filterData['value'],

Resources/public/js/grid.js

@@ -189,7 +189,11 @@ var Grid = {
             });
 
             form.find('select').each(function(){
-                $(this).prop('selectedIndex', 0).val("");
+                if(!$(this).hasClass('not-clear')) {
+                    $(this).prop('selectedIndex', 0).val("");
+                } else {
+                    $(this).prop('selectedIndex', 1).val(0);
+                }
             });
 
             form.find('textarea').each(function(){

Resources/views/AdminLTEBlocks.html.twig

@@ -61,10 +61,14 @@
         {% endif %}
         {% for column in grid.config.columns %}
             {% if column.filterable %}
+                {% set filterTypeClass = 'grid-filter-select' %}
+                {% if grid.form['filter'][column.name].filterType.vars.choices|length == 1 %}
+                    {% set filterTypeClass = filterTypeClass ~ ' not-clear' %}
+                {% endif %}
                 <th style="vertical-align: top;" class="filterable" data-grid-column="{{ column.name }}">
-                    <div class="input-group">
+                    <div class="input-group {% if grid.form['filter'][column.name].filterType.vars.choices|length == 1 %}hidden{% endif %}">
                         <span class="input-group-addon"><i class="fa fa-filter"></i></span>
-                        {{ form_row(grid.form['filter'][column.name].filterType, {attr: {class: 'grid-filter-select'}}) }}
+                        {{ form_row(grid.form['filter'][column.name].filterType, {attr: {class: filterTypeClass}}) }}
                     </div>
                     <div class="input-group">
                         <span class="input-group-addon"><i class="fa fa-arrow-right"></i></span>