@adminforth/universal-search 1.0.2 → 1.1.0

package/build.log

@@ -7,5 +7,5 @@ custom/
 custom/UniversalSearchInput.vue
 custom/tsconfig.json
 
-sent 4,166 bytes  received 58 bytes  8,448.00 bytes/sec
-total size is 3,942  speedup is 0.93
+sent 2,627 bytes  received 58 bytes  5,370.00 bytes/sec
+total size is 2,406  speedup is 0.90

package/custom/UniversalSearchInput.vue

@@ -4,7 +4,7 @@
     <input
       v-model="localValue"
       type="text"
-      placeholder="Universal search..."
+      :placeholder="props.meta?.placeholder ?? ''"
       class="border rounded px-2 py-1 text-sm w-64 dark:bg-gray-800 dark:border-gray-600"
       @keyup.enter="applyImmediate"
     />
@@ -26,62 +26,10 @@ const adminforth: any = (window as any).adminforth || {};
 const props = defineProps<{ meta?: any; resource?: any; adminUser?: any }>();
 const localValue = ref('');
 let debounceTimer: any = null;
-const filtersStore = adminforth.filtersStore || { filters: [], setFilters: () => {} };
-
-function buildFilters(term: string) {
-  const cols = props.meta?.columns as Array<any> | undefined;
-  if (!cols || !cols.length) return [];
-  const result: any[] = [];
-
-  cols.forEach(col => {
-    const searchBy = (col.searchBy === 'labelOnly' ? 'keyOnly' : col.searchBy) || 'valueOnly';
-    const addFilter = (field: string) => {
-      let operator: string;
-      let value: string;
-      if (col.exact) {
-        if (col.caseSensitive) {
-          operator = 'like';
-          value = term;
-        } else {
-          operator = 'eq';
-          value = term;
-        }
-      } else {
-        operator = col.caseSensitive ? 'like' : 'ilike';
-        value = `${term}`;
-      }
-      result.push({ field, operator, value });
-    };
-
-    if (searchBy === 'valueOnly') {
-      addFilter(col.name);
-    } else if (searchBy === 'keyOnly') {
-      addFilter(`${col.name}__key`);
-    } else if (searchBy === 'both') {
-      addFilter(col.name);
-      addFilter(`${col.name}__key`);
-    }
-  });
-
-  return result;
-}
 
 function applyInternal() {
   const term = localValue.value.trim();
-  const remaining = filtersStore.filters.filter((f: any) => !f._universal);
-  if (!term) {
-    filtersStore.setFilters(remaining);
-    adminforth.list.refresh && adminforth.list.refresh();
-    return;
-  }
-  const sub = buildFilters(term);
-  if (!sub || !sub.length) {
-    filtersStore.setFilters(remaining);
-    adminforth.list.refresh && adminforth.list.refresh();
-    return;
-  }
-  const orGroup = { operator: 'or', subFilters: sub, _universal: true };
-  filtersStore.setFilters([...remaining, orGroup]);
+  adminforth.__universalSearchTerm = term || undefined;
   adminforth.list.refresh && adminforth.list.refresh();
 }
 

package/dist/custom/UniversalSearchInput.vue

@@ -4,7 +4,7 @@
     <input
       v-model="localValue"
       type="text"
-      placeholder="Universal search..."
+      :placeholder="props.meta?.placeholder ?? ''"
       class="border rounded px-2 py-1 text-sm w-64 dark:bg-gray-800 dark:border-gray-600"
       @keyup.enter="applyImmediate"
     />
@@ -26,62 +26,10 @@ const adminforth: any = (window as any).adminforth || {};
 const props = defineProps<{ meta?: any; resource?: any; adminUser?: any }>();
 const localValue = ref('');
 let debounceTimer: any = null;
-const filtersStore = adminforth.filtersStore || { filters: [], setFilters: () => {} };
-
-function buildFilters(term: string) {
-  const cols = props.meta?.columns as Array<any> | undefined;
-  if (!cols || !cols.length) return [];
-  const result: any[] = [];
-
-  cols.forEach(col => {
-    const searchBy = (col.searchBy === 'labelOnly' ? 'keyOnly' : col.searchBy) || 'valueOnly';
-    const addFilter = (field: string) => {
-      let operator: string;
-      let value: string;
-      if (col.exact) {
-        if (col.caseSensitive) {
-          operator = 'like';
-          value = term;
-        } else {
-          operator = 'eq';
-          value = term;
-        }
-      } else {
-        operator = col.caseSensitive ? 'like' : 'ilike';
-        value = `${term}`;
-      }
-      result.push({ field, operator, value });
-    };
-
-    if (searchBy === 'valueOnly') {
-      addFilter(col.name);
-    } else if (searchBy === 'keyOnly') {
-      addFilter(`${col.name}__key`);
-    } else if (searchBy === 'both') {
-      addFilter(col.name);
-      addFilter(`${col.name}__key`);
-    }
-  });
-
-  return result;
-}
 
 function applyInternal() {
   const term = localValue.value.trim();
-  const remaining = filtersStore.filters.filter((f: any) => !f._universal);
-  if (!term) {
-    filtersStore.setFilters(remaining);
-    adminforth.list.refresh && adminforth.list.refresh();
-    return;
-  }
-  const sub = buildFilters(term);
-  if (!sub || !sub.length) {
-    filtersStore.setFilters(remaining);
-    adminforth.list.refresh && adminforth.list.refresh();
-    return;
-  }
-  const orGroup = { operator: 'or', subFilters: sub, _universal: true };
-  filtersStore.setFilters([...remaining, orGroup]);
+  adminforth.__universalSearchTerm = term || undefined;
   adminforth.list.refresh && adminforth.list.refresh();
 }
 

package/dist/index.js

@@ -40,6 +40,11 @@ export default class UniversalSearchPlugin extends AdminForthPlugin {
                     console.warn(`[UniversalSearchPlugin] Warning: column "${col.name}" has both exact=true and caseSensitive=true. Exact case-sensitive match implemented via LIKE without wildcards.`);
                 }
             });
+            const virtualFieldName = '_universal_search';
+            const ephemeral = true;
+            if (!Array.isArray(this.resourceConfig.columns))
+                this.resourceConfig.columns = [];
+            const exists = this.resourceConfig.columns.some(c => c.name === virtualFieldName);
             const injection = {
                 file: this.componentPath('UniversalSearchInput.vue'),
                 meta: {
@@ -55,6 +60,7 @@ export default class UniversalSearchPlugin extends AdminForthPlugin {
                         });
                     }),
                     debounceMs: (_a = this.options.debounceMs) !== null && _a !== void 0 ? _a : 500,
+                    placeholder: this.options.placeholder || '',
                 }
             };
             const listInjections = this.resourceConfig.options.pageInjections.list;
@@ -65,6 +71,85 @@ export default class UniversalSearchPlugin extends AdminForthPlugin {
                 current.push(injection);
             else
                 listInjections.beforeActionButtons = [current, injection];
+            if (!this.resourceConfig.hooks)
+                this.resourceConfig.hooks = {};
+            if (!this.resourceConfig.hooks.list)
+                this.resourceConfig.hooks.list = {};
+            const originalBefore = this.resourceConfig.hooks.list.beforeDatasourceRequest;
+            const transformFilters = (filters) => {
+                return filters.flatMap(f => {
+                    if (!f)
+                        return [];
+                    if (f.operator === 'or' || f.operator === 'and') {
+                        return [Object.assign(Object.assign({}, f), { subFilters: transformFilters(f.subFilters || []) })];
+                    }
+                    if (f.field === virtualFieldName) {
+                        const term = (f.value || '').toString().trim();
+                        if (!term)
+                            return [];
+                        const sub = [];
+                        columns.forEach(col => {
+                            const searchBy = (col.searchBy === 'labelOnly' ? 'keyOnly' : col.searchBy) || 'valueOnly';
+                            const addFilter = (field) => {
+                                let operator;
+                                let value;
+                                if (col.exact) {
+                                    if (col.caseSensitive) {
+                                        operator = 'like';
+                                        value = term;
+                                    }
+                                    else {
+                                        operator = 'eq';
+                                        value = term;
+                                    }
+                                }
+                                else {
+                                    operator = col.caseSensitive ? 'like' : 'ilike';
+                                    value = `${term}`;
+                                }
+                                sub.push({ field, operator, value });
+                            };
+                            if (searchBy === 'valueOnly')
+                                addFilter(col.name);
+                            else if (searchBy === 'keyOnly')
+                                addFilter(`${col.name}__key`);
+                            else if (searchBy === 'both') {
+                                addFilter(col.name);
+                                addFilter(`${col.name}__key`);
+                            }
+                        });
+                        if (!sub.length)
+                            return [];
+                        return [{ operator: 'or', subFilters: sub }];
+                    }
+                    return [f];
+                });
+            };
+            const transformer = (ctx) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const { query } = ctx;
+                if (ephemeral) {
+                    const term = (((_a = query === null || query === void 0 ? void 0 : query.body) === null || _a === void 0 ? void 0 : _a.__universal_search_term) || (query === null || query === void 0 ? void 0 : query.__universal_search_term) || '').toString().trim();
+                    if (term) {
+                        const tempFilter = { field: virtualFieldName, operator: 'eq', value: term };
+                        query.filters = Array.isArray(query.filters) ? [...query.filters, tempFilter] : [tempFilter];
+                    }
+                }
+                if (Array.isArray(query === null || query === void 0 ? void 0 : query.filters)) {
+                    query.filters = transformFilters(query.filters);
+                }
+                return { ok: true, error: '' };
+            });
+            if (!originalBefore) {
+                this.resourceConfig.hooks.list.beforeDatasourceRequest = [transformer];
+            }
+            else if (Array.isArray(originalBefore)) {
+                originalBefore.push(transformer);
+                this.resourceConfig.hooks.list.beforeDatasourceRequest = originalBefore;
+            }
+            else {
+                this.resourceConfig.hooks.list.beforeDatasourceRequest = [originalBefore, transformer];
+            }
         });
     }
 }

package/index.ts

@@ -1,4 +1,4 @@
-import { AdminForthPlugin, AdminForthResource, IAdminForth } from 'adminforth';
+import { AdminForthPlugin, AdminForthResource, IAdminForth, AdminForthDataTypes } from 'adminforth';
 import { PluginOptions, UniversalSearchColumnConfig } from './types.js';
 
 export default class UniversalSearchPlugin extends AdminForthPlugin {
@@ -35,6 +35,12 @@ export default class UniversalSearchPlugin extends AdminForthPlugin {
       }
     });
 
+    const virtualFieldName = '_universal_search';
+    const ephemeral = true;
+
+    if (!Array.isArray(this.resourceConfig.columns)) this.resourceConfig.columns = [] as any;
+    const exists = (this.resourceConfig.columns as any[]).some(c => c.name === virtualFieldName);
+
     const injection = {
       file: this.componentPath('UniversalSearchInput.vue'),
       meta: {
@@ -47,6 +53,7 @@ export default class UniversalSearchPlugin extends AdminForthPlugin {
           exact: col.exact ?? false,
         })),
         debounceMs: this.options.debounceMs ?? 500,
+        placeholder: this.options.placeholder || '',
       }
     };
 
@@ -55,5 +62,73 @@ export default class UniversalSearchPlugin extends AdminForthPlugin {
     if (!current) listInjections.beforeActionButtons = [injection];
     else if (Array.isArray(current)) current.push(injection as any);
     else listInjections.beforeActionButtons = [current as any, injection as any];
+
+    if (!this.resourceConfig.hooks) this.resourceConfig.hooks = {} as any;
+    if (!this.resourceConfig.hooks.list) this.resourceConfig.hooks.list = {} as any;
+    const originalBefore = this.resourceConfig.hooks.list.beforeDatasourceRequest;
+
+    const transformFilters = (filters: any[]): any[] => {
+      return filters.flatMap(f => {
+        if (!f) return [];
+        if (f.operator === 'or' || f.operator === 'and') {
+          return [{ ...f, subFilters: transformFilters(f.subFilters || []) }];
+        }
+        if (f.field === virtualFieldName) {
+          const term = (f.value || '').toString().trim();
+            if (!term) return [];
+            const sub: any[] = [];
+            columns.forEach(col => {
+              const searchBy = (col.searchBy === 'labelOnly' ? 'keyOnly' : col.searchBy) || 'valueOnly';
+              const addFilter = (field: string) => {
+                let operator: string;
+                let value: string;
+                if (col.exact) {
+                  if (col.caseSensitive) {
+                    operator = 'like';
+                    value = term;
+                  } else {
+                    operator = 'eq';
+                    value = term;
+                  }
+                } else {
+                  operator = col.caseSensitive ? 'like' : 'ilike';
+                  value = `${term}`;
+                }
+                sub.push({ field, operator, value });
+              };
+              if (searchBy === 'valueOnly') addFilter(col.name);
+              else if (searchBy === 'keyOnly') addFilter(`${col.name}__key`);
+              else if (searchBy === 'both') { addFilter(col.name); addFilter(`${col.name}__key`); }
+            });
+            if (!sub.length) return [];
+            return [{ operator: 'or', subFilters: sub }];
+        }
+        return [f];
+      });
+    };
+
+    const transformer = async (ctx: any) => {
+      const { query } = ctx;
+      if (ephemeral) {
+        const term = (query?.body?.__universal_search_term || query?.__universal_search_term || '').toString().trim();
+        if (term) {
+          const tempFilter = { field: virtualFieldName, operator: 'eq', value: term };
+          query.filters = Array.isArray(query.filters) ? [...query.filters, tempFilter] : [tempFilter];
+        }
+      }
+      if (Array.isArray(query?.filters)) {
+        query.filters = transformFilters(query.filters);
+      }
+      return { ok: true, error: '' };
+    };
+
+    if (!originalBefore) {
+      this.resourceConfig.hooks.list.beforeDatasourceRequest = [transformer];
+    } else if (Array.isArray(originalBefore)) {
+      originalBefore.push(transformer);
+      this.resourceConfig.hooks.list.beforeDatasourceRequest = originalBefore;
+    } else {
+      this.resourceConfig.hooks.list.beforeDatasourceRequest = [originalBefore, transformer];
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/universal-search",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Universal quick search input plugin for AdminForth (injected before action buttons)",
   "type": "module",
   "main": "dist/index.js",

package/types.ts

@@ -10,4 +10,5 @@ export interface UniversalSearchColumnConfig {
 export interface PluginOptions {
   columns?: UniversalSearchColumnConfig[];
   debounceMs?: number;
+  placeholder?: string;
 }