From aabb6b5cfd7f1af08ec20a826b66a98b09bcebd2 Mon Sep 17 00:00:00 2001
From: thomasp-cnrs <70278749+thomasp-cnrs@users.noreply.github.com>
Date: Thu, 17 Oct 2024 13:46:06 +0200
Subject: [PATCH] Fixed templates for column filtering (#348)

* Fixed templates for column filtering

Original author: @kathibeepboop

* Harden comparaison in templates
---
 src/Resources/views/Filter/select.html.twig  |  7 +--
 src/Resources/views/Filter/select.js.twig    |  4 +-
 src/Resources/views/Filter/text.html.twig    | 15 ++---
 src/Resources/views/Filter/text.js.twig      |  4 +-
 src/Resources/views/datatable_html.html.twig | 64 +++++++++++++++++---
 5 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/src/Resources/views/Filter/select.html.twig b/src/Resources/views/Filter/select.html.twig
index 6a39c814..a5cab1a2 100644
--- a/src/Resources/views/Filter/select.html.twig
+++ b/src/Resources/views/Filter/select.html.twig
@@ -1,9 +1,6 @@
 <label>
-    <select
-            id="{{ datatable.setting('name') }}-column-{{ column.index }}"
-            data-search-column-index="{{ column.index }}"
-    >
-        {% if column.filter.placeholder != null %}
+    <select class="form-control" id="{{ datatable.name }}-column-{{ column.index }}" data-search-column-index="{{ column.index }}">
+        {% if column.filter.placeholder is not same as(null) %}
             <option class="placeholder">{{ column.filter.placeholder|trans }}</option>
         {% endif %}
         {% for key, choice in column.filter.choices %}
diff --git a/src/Resources/views/Filter/select.js.twig b/src/Resources/views/Filter/select.js.twig
index f33df782..a77ed8b6 100644
--- a/src/Resources/views/Filter/select.js.twig
+++ b/src/Resources/views/Filter/select.js.twig
@@ -1,3 +1,3 @@
-$('#{{ datatable.setting('name') }}').on('stateLoaded.dt', function (e, settings, data) {
-    $('#{{ datatable.setting('name') }}-column-{{ column.index }}').val(data.columns[{{ column.index }}].search.search) ;
+$('#{{ datatable.name }}').on('stateLoaded.dt', function (e, settings, data) {
+    $('#{{ datatable.name }}-column-{{ column.index }}').val(data.columns[{{ column.index }}].search.search);
 });
diff --git a/src/Resources/views/Filter/text.html.twig b/src/Resources/views/Filter/text.html.twig
index 388afc43..3ebfd02c 100644
--- a/src/Resources/views/Filter/text.html.twig
+++ b/src/Resources/views/Filter/text.html.twig
@@ -1,13 +1,8 @@
 <label>
-    <input id="{{ datatable.setting('name') }}-column-{{ column.index }}"
+    <input class="form-control"
+           id="{{ datatable.name }}-column-{{ column.index }}"
            data-search-column-index="{{ column.index }}"
-            {% if column.filter.placeholder != null %}
-                placeholder="{{ column.filter.placeholder|trans }}"
-            {% endif %}
-           value="{{ column.searchValue }}">
-    <script>
-        document.getElementById('domains').addEventListener('restore', function (e, data) {
-            console.log(data);
-        });
-    </script>
+           placeholder="{{ column.filter.placeholder ?? '' }}"
+           value="{{ searchValue ?? '' }}"
+    />
 </label>
diff --git a/src/Resources/views/Filter/text.js.twig b/src/Resources/views/Filter/text.js.twig
index f33df782..a77ed8b6 100644
--- a/src/Resources/views/Filter/text.js.twig
+++ b/src/Resources/views/Filter/text.js.twig
@@ -1,3 +1,3 @@
-$('#{{ datatable.setting('name') }}').on('stateLoaded.dt', function (e, settings, data) {
-    $('#{{ datatable.setting('name') }}-column-{{ column.index }}').val(data.columns[{{ column.index }}].search.search) ;
+$('#{{ datatable.name }}').on('stateLoaded.dt', function (e, settings, data) {
+    $('#{{ datatable.name }}-column-{{ column.index }}').val(data.columns[{{ column.index }}].search.search);
 });
diff --git a/src/Resources/views/datatable_html.html.twig b/src/Resources/views/datatable_html.html.twig
index b9f77345..e1b5d1e8 100644
--- a/src/Resources/views/datatable_html.html.twig
+++ b/src/Resources/views/datatable_html.html.twig
@@ -1,29 +1,75 @@
 {% trans_default_domain datatable.translationDomain %}
 
-<table id="{{ datatable.name }}" class="{% if className is defined and className is not empty %}{{ className }}{% endif %}">
+<table id="{{ datatable.name }}"  class="{% if className is defined and className is not empty %}{{ className }}{% endif %}">
     <thead>
     <tr>
         {% for column in datatable.columns %}
             <th>{{ column.label|trans }}</th>
         {% endfor %}
     </tr>
-    {#% if datatable.option('searching') and datatable.setting('column_filter') in ['both', 'thead'] %}
+    {% if datatable.option('searching') and columnFilter ?? '' in ['both', 'thead'] %}
         <tr class="datatable-filters">
             {% for column in datatable.columns %}
-                <td>{% if column.filter != null %}{% include column.filter.templateHtml %}{% endif %}</td>
+                <td>
+                    {% if column.filter is not same as(null) %}{% include column.filter.templateHtml %}{% endif %}
+                </td>
             {% endfor %}
         </tr>
-    {% endif %#}
+    {% endif %}
     </thead>
-    {#% if datatable.option('searching') and datatable.setting('column_filter') in ['both', 'tfoot'] %}
+    <tbody>
+    </tbody>
+
+    {% if datatable.option('searching') and columnFilter ?? '' in ['both', 'tfoot'] %}
         <tfoot>
         <tr class="datatable-filters">
             {% for column in datatable.columns %}
-                <td>{% if column.filter != null %}{% include column.filter.templateHtml %}{% endif %}</td>
+                <td>
+                    {% if column.filter is not same as(null) %}{% include column.filter.templateHtml %}{% endif %}
+                </td>
             {% endfor %}
         </tr>
         </tfoot>
-    {% endif %#}
-    <tbody>
-    </tbody>
+    {% endif %}
 </table>
+
+{% if datatable.option('searching') %}
+    <script>
+        $('#{{ datatable.name }}').on('init.dt', function (e, settings, json) {
+            const table = $('#{{ datatable.name }}').DataTable();
+
+            {% for column in datatable.columns %}
+                {% if column.filter is not same as(null) %}
+                    {% include column.filter.templateJs %}
+
+                    $(function () {
+                        $('#{{ datatable.name }}-column-{{ column.index }}').on(
+                            "keyup change",
+                            delay(function () {
+                                    const column = table.columns({{ column.index }});
+                                    const newValue = $(this).val();
+
+                                    if (column.search() !== newValue) {
+                                        column.search(newValue).draw();
+                                    }
+                                }
+                                , {{ datatable.option('searchDelay') }}
+                            )
+                        )
+                    });
+                {% endif %}
+            {% endfor %}
+        });
+
+        function delay(callback, ms) {
+            let timer = 0;
+            return function () {
+                let context = this, args = arguments;
+                clearTimeout(timer);
+                timer = setTimeout(function () {
+                    callback.apply(context, args);
+                }, ms || 0);
+            };
+        }
+    </script>
+{% endif %}