Merge pull request #47 from pennions/feat/flightkit/table

feat: made searching on annotations possible
pennions · Dec 22, 2024 · 36453c0 · 36453c0
2 parents 5c0d166 + bae1ec7
commit 36453c0
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 7 deletions.
diff --git a/dist/flightkit-v0.0.23/flightkit.min.js b/dist/flightkit-v0.0.23/flightkit.min.js
diff --git a/dist/flightkit-v0.0.23/flightkit.js → dist/flightkit-v0.0.24/flightkit.js b/dist/flightkit-v0.0.23/flightkit.js → dist/flightkit-v0.0.24/flightkit.js
@@ -359,6 +359,8 @@
             const ftEvent = returnEventWithTopLevelElement(event);
             ftEvent.contents = event.detail;
             const callback = ftEvent.target.getAttribute(`e-${ftEvent.type}`);
+            if (!callback) return;
+
             const callbackParts = callback.split('.');
 
             let actualCallback = undefined;
@@ -657,8 +659,32 @@
             if (this.filter.length) {
                 for (const data of tableData) {
                     let valuesInData = Object.values(data).join(" ").toLowerCase();
+                    let valueInAnnotation = false;
+                    if (Object.keys(this.contentAnnotations).length) {
+
+                        for (const property of this.columnOrder) {
+                            const annotation = this.getAnnotation(property, "body");
+
+                            let annotationProperties = annotation[property];
+
+                            if (annotationProperties && Object.keys(annotationProperties).length) {
+                                let dataComparison = data[property];
+
+                                if (dataComparison != null) {
+                                    let annotationValue = annotationProperties[dataComparison];
+                                    if (annotationValue) {
+                                        valueInAnnotation = annotationValue.toString().toLowerCase().includes(this.filter.toLowerCase());
+                                    }
+                                }
+                            }
+
+                            if (valueInAnnotation) {
+                                break;
+                            }
+                        }
+                    }
 
-                    if (valuesInData.includes(this.filter)) {
+                    if (valuesInData.includes(this.filter.toLowerCase()) || valueInAnnotation) {
                         filteredData.push(data);
                     }
                 }

diff --git a/dist/flightkit-v0.0.24/flightkit.min.js b/dist/flightkit-v0.0.24/flightkit.min.js
diff --git a/docs/cdn/ibiss-v0.0.24/avian.min.css b/docs/cdn/ibiss-v0.0.24/avian.min.css
diff --git a/docs/cdn/ibiss-v0.0.24/flightkit.min.js b/docs/cdn/ibiss-v0.0.24/flightkit.min.js
diff --git a/docs/cdn/ibiss-v0.0.24/htmx-ibiss-ui.min.js b/docs/cdn/ibiss-v0.0.24/htmx-ibiss-ui.min.js
diff --git a/docs/cdn/ibiss-v0.0.24/rocket.min.js b/docs/cdn/ibiss-v0.0.24/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.24/avian.min.css b/documentation/public/cdn/ibiss-v0.0.24/avian.min.css
diff --git a/documentation/public/cdn/ibiss-v0.0.24/flightkit.min.js b/documentation/public/cdn/ibiss-v0.0.24/flightkit.min.js
diff --git a/documentation/public/cdn/ibiss-v0.0.24/htmx-ibiss-ui.min.js b/documentation/public/cdn/ibiss-v0.0.24/htmx-ibiss-ui.min.js
diff --git a/documentation/public/cdn/ibiss-v0.0.24/rocket.min.js b/documentation/public/cdn/ibiss-v0.0.24/rocket.min.js
diff --git a/documentation/public/js/flightkit.min.js b/documentation/public/js/flightkit.min.js
diff --git a/flightkit/components/extensions/base_component.js b/flightkit/components/extensions/base_component.js
@@ -93,6 +93,8 @@ export class BaseComponent {
         const ftEvent = returnEventWithTopLevelElement(event);
         ftEvent.contents = event.detail;
         const callback = ftEvent.target.getAttribute(`e-${ftEvent.type}`);
+        if (!callback) return;
+
         const callbackParts = callback.split('.');
 
         let actualCallback = undefined;

diff --git a/flightkit/components/table.js b/flightkit/components/table.js
@@ -171,8 +171,32 @@ export class FlightkitTable extends HTMLElement {
         if (this.filter.length) {
             for (const data of tableData) {
                 let valuesInData = Object.values(data).join(" ").toLowerCase();
+                let valueInAnnotation = false;
+                if (Object.keys(this.contentAnnotations).length) {
+
+                    for (const property of this.columnOrder) {
+                        const annotation = this.getAnnotation(property, "body");
+
+                        let annotationProperties = annotation[property];
+
+                        if (annotationProperties && Object.keys(annotationProperties).length) {
+                            let dataComparison = data[property]
+
+                            if (dataComparison != null) {
+                                let annotationValue = annotationProperties[dataComparison]
+                                if (annotationValue) {
+                                    valueInAnnotation = annotationValue.toString().toLowerCase().includes(this.filter.toLowerCase())
+                                }
+                            }
+                        }
+
+                        if (valueInAnnotation) {
+                            break;
+                        }
+                    }
+                }
 
-                if (valuesInData.includes(this.filter)) {
+                if (valuesInData.includes(this.filter.toLowerCase()) || valueInAnnotation) {
                     filteredData.push(data)
                 }
             }

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