chore: custom implementation of filtering, due to bug in joq with nul…

…ls / numbers
pennions · Jul 3, 2024 · e3bfbc1 · e3bfbc1
1 parent f9e7039
commit e3bfbc1
Show file tree

Hide file tree

Showing 16 changed files with 68 additions and 45 deletions.
diff --git a/dist/flightkit-v0.0.5/flightkit.min.js b/dist/flightkit-v0.0.5/flightkit.min.js
diff --git a/dist/flightkit-v0.0.5/flightkit.js → dist/flightkit-v0.0.6/flightkit.js b/dist/flightkit-v0.0.5/flightkit.js → dist/flightkit-v0.0.6/flightkit.js
@@ -1150,33 +1150,30 @@
                 this.contents.sort([]);
             }
 
-            if (this.filter.length) {
-                const filters = [];
-
-                for (const property of this.columnOrder) {
-                    filters.push({
-                        propertyName: property,
-                        value: this.filter,
-                        operator: 'like',
-                        type: 'or', /** optional, defaults to "and" **/
-                        ignoreCase: true /** optional, defaults to "false" **/
-                    });
-                }
-                this.contents.filter(filters);
-            }
-            else {
-                this.contents.filter([]);
-            }
-
             const tableHead = this.createHead();
             tableElement.append(tableHead);
 
             if (this._templates['caption']) {
                 tableElement.append(this._createElement('caption'));
             }
 
-            const data = this.contents.execute();
-            const tableBody = this.createBody(data);
+            const orderedData = this.contents.execute();
+            let filteredData = [];
+            if (this.filter.length) {
+                for (const data of orderedData) {
+                    let valuesInData = Object.values(data).join(" ").toLowerCase();
+
+                    if (valuesInData.includes(this.filter)) {
+                        filteredData.push(data);
+                    }
+                }
+            }
+            else {
+                filteredData = orderedData;
+            }
+
+
+            const tableBody = this.createBody(filteredData);
             tableElement.append(tableBody);
 
             if (this._templates['tfoot']) {

diff --git a/dist/flightkit-v0.0.6/flightkit.min.js b/dist/flightkit-v0.0.6/flightkit.min.js
diff --git a/docs/cdn/ibiss-v0.0.6/avian.min.css b/docs/cdn/ibiss-v0.0.6/avian.min.css
diff --git a/docs/cdn/ibiss-v0.0.6/flightkit.min.js b/docs/cdn/ibiss-v0.0.6/flightkit.min.js
diff --git a/docs/cdn/ibiss-v0.0.6/htmx-ibiss-ui.min.js b/docs/cdn/ibiss-v0.0.6/htmx-ibiss-ui.min.js
diff --git a/docs/cdn/ibiss-v0.0.6/rocket.min.js b/docs/cdn/ibiss-v0.0.6/rocket.min.js
diff --git a/docs/js/flightkit.min.js b/docs/js/flightkit.min.js
diff --git a/documentation/public/cdn/ibiss-v0.0.6/avian.min.css b/documentation/public/cdn/ibiss-v0.0.6/avian.min.css
diff --git a/documentation/public/cdn/ibiss-v0.0.6/flightkit.min.js b/documentation/public/cdn/ibiss-v0.0.6/flightkit.min.js
diff --git a/documentation/public/cdn/ibiss-v0.0.6/htmx-ibiss-ui.min.js b/documentation/public/cdn/ibiss-v0.0.6/htmx-ibiss-ui.min.js
diff --git a/documentation/public/cdn/ibiss-v0.0.6/rocket.min.js b/documentation/public/cdn/ibiss-v0.0.6/rocket.min.js
diff --git a/documentation/public/js/flightkit.min.js b/documentation/public/js/flightkit.min.js
diff --git a/flightkit/components/table.js b/flightkit/components/table.js
@@ -176,33 +176,30 @@ export class FlightkitTable extends HTMLElement {
             this.contents.sort([]);
         }
 
-        if (this.filter.length) {
-            const filters = [];
-
-            for (const property of this.columnOrder) {
-                filters.push({
-                    propertyName: property,
-                    value: this.filter,
-                    operator: 'like',
-                    type: 'or', /** optional, defaults to "and" **/
-                    ignoreCase: true /** optional, defaults to "false" **/
-                });
-            }
-            this.contents.filter(filters);
-        }
-        else {
-            this.contents.filter([]);
-        }
-
         const tableHead = this.createHead();
         tableElement.append(tableHead);
 
         if (this._templates['caption']) {
             tableElement.append(this._createElement('caption'));
         }
 
-        const data = this.contents.execute();
-        const tableBody = this.createBody(data);
+        const orderedData = this.contents.execute();
+        let filteredData = []
+        if (this.filter.length) {
+            for (const data of orderedData) {
+                let valuesInData = Object.values(data).join(" ").toLowerCase();
+
+                if (valuesInData.includes(this.filter)) {
+                    filteredData.push(data)
+                }
+            }
+        }
+        else {
+            filteredData = orderedData
+        }
+
+
+        const tableBody = this.createBody(filteredData);
         tableElement.append(tableBody);
 
         if (this._templates['tfoot']) {

diff --git a/flightkit/index.html b/flightkit/index.html
@@ -20,6 +20,11 @@
 </head>
 
 <body class="row gap-5 p-3">
+    <div>
+        <input type="text" id="table-filter" placeholder="filter">
+        <flk-table id="db-table"></flk-table>
+    </div>
+
     <flk-tree-nav id="tree-nav" e-tree-click="clicky"></flk-tree-nav>
     <div>
 
@@ -69,6 +74,22 @@
             databasesNav.setContents(window.databaseSet);
 
             databasesNav.init();
+             const dbTable = document.getElementById("db-table")
+            dbTable.setContents(window.databaseSet.database1.table1);
+            dbTable.init();
+
+            let timer;
+            document.getElementById('table-filter').addEventListener('keyup', (e) => {
+                if (timer) {
+                    clearTimeout(timer)
+                }
+
+                timer = setTimeout(() => {
+                    dbTable.filter = e.target.value;
+                    dbTable.init();
+                })
+
+            })
         };
     </script>
 </body>

diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "@pennions/ibiss",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "avian_version": "0.0.2",
-  "flightkit_version": "0.0.5",
+  "flightkit_version": "0.0.6",
   "htmx_plugin_version": "0.0.1",
   "rocketjs_version": "0.0.1",
   "description": "Frontend library of Pennions",