@adminforth/universal-search 1.1.2 → 1.3.0

package/build.log

@@ -7,5 +7,5 @@ custom/
 custom/UniversalSearchInput.vue
 custom/tsconfig.json
 
-sent 2,630 bytes  received 58 bytes  5,376.00 bytes/sec
-total size is 2,406  speedup is 0.90
+sent 2,519 bytes  received 58 bytes  5,154.00 bytes/sec
+total size is 2,295  speedup is 0.89

package/custom/UniversalSearchInput.vue

@@ -21,38 +21,41 @@
 </template>
 <script setup lang="ts">
 import { ref, watch } from 'vue';
-const adminforth: any = (window as any).adminforth || {};
+import adminforth from '@/adminforth';
+import { AdminForthFilterOperators } from '@/types/Common';
 
 const props = defineProps<{ meta?: any; resource?: any; adminUser?: any }>();
 const localValue = ref('');
-let debounceTimer: any = null;
+let t: any = null;
 
-function applyInternal() {
+function send(term?: string) {
+  adminforth?.list?.updateFilter?.({
+    field: '_universal_search',
+    operator: AdminForthFilterOperators.EQ,
+    value: term || '',
+  });
+  adminforth?.list?.refresh?.();
+}
+
+function apply() {
   const term = localValue.value.trim();
-  adminforth.__universalSearchTerm = term || undefined;
-  adminforth.list.refresh && adminforth.list.refresh();
+  send(term || '');
 }
 
 function applyImmediate() {
-  if (debounceTimer) {
-    clearTimeout(debounceTimer);
-    debounceTimer = null;
-  }
-  applyInternal();
+  if (t) clearTimeout(t);
+  t = null;
+  apply();
 }
 
 watch(localValue, () => {
   const delay = props.meta?.debounceMs ?? 500;
-  if (debounceTimer) {
-    clearTimeout(debounceTimer);
-  }
-  debounceTimer = setTimeout(() => {
-    applyInternal();
-  }, delay);
+  if (t) clearTimeout(t);
+  t = setTimeout(apply, delay);
 });
 
 function clear() {
   localValue.value = '';
   applyImmediate();
 }
-</script>
+</script>

package/custom/tsconfig.json

@@ -4,15 +4,12 @@
     "esModuleInterop": true,
     "paths": {
       "@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
-        "../../../spa/src/*"
+        "../node_modules/adminforth/dist/spa/src/*"
       ],
       "*": [
-        // "node_modules/adminforth/dist/spa/node_modules/*"
-        "../../../spa/node_modules/*"
+        "../node_modules/adminforth/dist/spa/node_modules/*"
       ],
       "@@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "."
       ]
     }

package/dist/custom/UniversalSearchInput.vue

@@ -21,38 +21,41 @@
 </template>
 <script setup lang="ts">
 import { ref, watch } from 'vue';
-const adminforth: any = (window as any).adminforth || {};
+import adminforth from '@/adminforth';
+import { AdminForthFilterOperators } from '@/types/Common';
 
 const props = defineProps<{ meta?: any; resource?: any; adminUser?: any }>();
 const localValue = ref('');
-let debounceTimer: any = null;
+let t: any = null;
 
-function applyInternal() {
+function send(term?: string) {
+  adminforth?.list?.updateFilter?.({
+    field: '_universal_search',
+    operator: AdminForthFilterOperators.EQ,
+    value: term || '',
+  });
+  adminforth?.list?.refresh?.();
+}
+
+function apply() {
   const term = localValue.value.trim();
-  adminforth.__universalSearchTerm = term || undefined;
-  adminforth.list.refresh && adminforth.list.refresh();
+  send(term || '');
 }
 
 function applyImmediate() {
-  if (debounceTimer) {
-    clearTimeout(debounceTimer);
-    debounceTimer = null;
-  }
-  applyInternal();
+  if (t) clearTimeout(t);
+  t = null;
+  apply();
 }
 
 watch(localValue, () => {
   const delay = props.meta?.debounceMs ?? 500;
-  if (debounceTimer) {
-    clearTimeout(debounceTimer);
-  }
-  debounceTimer = setTimeout(() => {
-    applyInternal();
-  }, delay);
+  if (t) clearTimeout(t);
+  t = setTimeout(apply, delay);
 });
 
 function clear() {
   localValue.value = '';
   applyImmediate();
 }
-</script>
+</script>

package/dist/custom/tsconfig.json

@@ -4,15 +4,12 @@
     "esModuleInterop": true,
     "paths": {
       "@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
-        "../../../spa/src/*"
+        "../node_modules/adminforth/dist/spa/src/*"
       ],
       "*": [
-        // "node_modules/adminforth/dist/spa/node_modules/*"
-        "../../../spa/node_modules/*"
+        "../node_modules/adminforth/dist/spa/node_modules/*"
       ],
       "@@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "."
       ]
     }

package/dist/index.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { AdminForthPlugin, Filters } from 'adminforth';
+import { AdminForthPlugin, AdminForthDataTypes, Filters } from 'adminforth';
 export default class UniversalSearchPlugin extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
@@ -45,6 +45,15 @@ export default class UniversalSearchPlugin extends AdminForthPlugin {
             if (!Array.isArray(this.resourceConfig.columns))
                 this.resourceConfig.columns = [];
             const exists = this.resourceConfig.columns.some(c => c.name === virtualFieldName);
+            if (!exists) {
+                this.resourceConfig.columns.push({
+                    name: virtualFieldName,
+                    virtual: true,
+                    type: AdminForthDataTypes.STRING,
+                    label: 'Universal Search',
+                    showIn: { all: false },
+                });
+            }
             const injection = {
                 file: this.componentPath('UniversalSearchInput.vue'),
                 meta: {
@@ -76,67 +85,72 @@ export default class UniversalSearchPlugin extends AdminForthPlugin {
             if (!this.resourceConfig.hooks.list)
                 this.resourceConfig.hooks.list = {};
             const originalBefore = this.resourceConfig.hooks.list.beforeDatasourceRequest;
+            const VIRTUAL_FIELD = '_universal_search';
             const transformFilters = (filters) => {
-                return filters.flatMap(f => {
+                return (filters !== null && filters !== void 0 ? filters : []).flatMap(f => {
+                    var _a, _b;
                     if (!f)
                         return [];
-                    if (f.operator === 'or' || f.operator === 'and') {
+                    const op = String((_a = f.operator) !== null && _a !== void 0 ? _a : '').toLowerCase();
+                    if (op === 'or' || op === 'and') {
                         return [Object.assign(Object.assign({}, f), { subFilters: transformFilters(f.subFilters || []) })];
                     }
-                    if (f.field === virtualFieldName) {
-                        const term = (f.value || '').toString().trim();
+                    if (f.field === VIRTUAL_FIELD) {
+                        const term = String((_b = f.value) !== null && _b !== void 0 ? _b : '').trim();
                         if (!term)
                             return [];
                         const sub = [];
-                        columns.forEach(col => {
+                        for (const col of columns) {
                             const searchBy = (col.searchBy === 'labelOnly' ? 'keyOnly' : col.searchBy) || 'valueOnly';
-                            const addFilter = (field) => {
+                            const add = (field) => {
                                 if (col.exact) {
-                                    if (col.caseSensitive) {
+                                    if (col.caseSensitive)
                                         sub.push(Filters.LIKE(field, term));
-                                    }
-                                    else {
+                                    else
                                         sub.push(Filters.EQ(field, term));
-                                    }
                                 }
                                 else {
-                                    if (col.caseSensitive) {
-                                        sub.push(Filters.LIKE(field, term));
-                                    }
-                                    else {
-                                        sub.push(Filters.ILIKE ? Filters.ILIKE(field, term) : { field, operator: 'ilike', value: term });
-                                    }
+                                    const likeVal = `${term}`;
+                                    if (col.caseSensitive)
+                                        sub.push(Filters.LIKE(field, likeVal));
+                                    else if (Filters.ILIKE)
+                                        sub.push(Filters.ILIKE(field, likeVal));
+                                    else
+                                        sub.push(Filters.LIKE(field, likeVal));
                                 }
                             };
                             if (searchBy === 'valueOnly')
-                                addFilter(col.name);
+                                add(col.name);
                             else if (searchBy === 'keyOnly')
-                                addFilter(`${col.name}__key`);
-                            else if (searchBy === 'both') {
-                                addFilter(col.name);
-                                addFilter(`${col.name}__key`);
+                                add(`${col.name}__key`);
+                            else {
+                                add(col.name);
+                                add(`${col.name}__key`);
                             }
-                        });
+                        }
                         if (!sub.length)
                             return [];
-                        console.log('UniversalSearchPlugin: transformed filter', f, '=>', sub);
-                        return [Filters.OR(sub)];
+                        return [Filters.OR(...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);
+            const transformer = (_a) => __awaiter(this, [_a], void 0, function* ({ query }) {
+                var _b, _c, _d, _e, _f;
+                const term = String(((_e = (_d = (_c = (_b = query === null || query === void 0 ? void 0 : query.body) === null || _b === void 0 ? void 0 : _b.__universal_search_term) !== null && _c !== void 0 ? _c : query === null || query === void 0 ? void 0 : query.__universal_search_term) !== null && _d !== void 0 ? _d : global.__universal_search_term) !== null && _e !== void 0 ? _e : '')).trim();
+                const incoming = Array.isArray(query === null || query === void 0 ? void 0 : query.filters)
+                    ? query.filters
+                    : Array.isArray((_f = query === null || query === void 0 ? void 0 : query.body) === null || _f === void 0 ? void 0 : _f.filters)
+                        ? query.body.filters
+                        : [];
+                const withVirtual = term
+                    ? [...incoming, { field: VIRTUAL_FIELD, operator: 'eq', value: term }]
+                    : incoming;
+                const transformed = transformFilters(withVirtual);
+                query.filters = transformed;
+                query.body = Object.assign(Object.assign({}, (query.body || {})), { filters: transformed });
+                if (query.body.__universal_search_term !== undefined) {
+                    delete query.body.__universal_search_term;
                 }
                 return { ok: true, error: '' };
             });

package/index.ts

@@ -40,6 +40,15 @@ export default class UniversalSearchPlugin extends AdminForthPlugin {
 
     if (!Array.isArray(this.resourceConfig.columns)) this.resourceConfig.columns = [] as any;
     const exists = (this.resourceConfig.columns as any[]).some(c => c.name === virtualFieldName);
+    if (!exists) {
+      (this.resourceConfig.columns as any[]).push({
+        name: virtualFieldName,
+        virtual: true,
+        type: AdminForthDataTypes.STRING,
+        label: 'Universal Search',
+        showIn: { all: false },
+      });
+    }
 
     const injection = {
       file: this.componentPath('UniversalSearchInput.vue'),
@@ -67,59 +76,74 @@ export default class UniversalSearchPlugin extends AdminForthPlugin {
     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) => {
-              if (col.exact) {
-                if (col.caseSensitive) {
-                  sub.push(Filters.LIKE(field, term));
-                } else {
-                  sub.push(Filters.EQ(field, term));
-                }
-              } else {
-                if (col.caseSensitive) {
-                  sub.push(Filters.LIKE(field, term));
-                } else {
-                  sub.push((Filters as any).ILIKE ? (Filters as any).ILIKE(field, term) : { field, operator: 'ilike', value: term });
-                }
-              }
-            };
-            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 [];
-          console.log('UniversalSearchPlugin: transformed filter', f, '=>', sub);
-          return [Filters.OR(sub)];
-        }
-        return [f];
-      });
-    };
+const VIRTUAL_FIELD = '_universal_search';
 
-    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);
+const transformFilters = (filters: any[]): any[] => {
+  return (filters ?? []).flatMap(f => {
+    if (!f) return [];
+    const op = String(f.operator ?? '').toLowerCase();
+    if (op === 'or' || op === 'and') {
+      return [{ ...f, subFilters: transformFilters(f.subFilters || []) }];
+    }
+    if (f.field === VIRTUAL_FIELD) {
+      const term = String(f.value ?? '').trim();
+      if (!term) return [];
+      const sub: any[] = [];
+
+      for (const col of columns) {
+        const searchBy = (col.searchBy === 'labelOnly' ? 'keyOnly' : col.searchBy) || 'valueOnly';
+        const add = (field: string) => {
+          if (col.exact) {
+            if (col.caseSensitive) sub.push(Filters.LIKE(field, term));      
+            else sub.push(Filters.EQ(field, term)); 
+          } else {
+            const likeVal = `${term}`;
+            if (col.caseSensitive) sub.push(Filters.LIKE(field, likeVal));
+            else if ((Filters as any).ILIKE) sub.push((Filters as any).ILIKE(field, likeVal));
+            else sub.push(Filters.LIKE(field, likeVal));
+          }
+        };
+        if (searchBy === 'valueOnly') add(col.name);
+        else if (searchBy === 'keyOnly') add(`${col.name}__key`);
+        else { add(col.name); add(`${col.name}__key`); }
       }
-      return { ok: true, error: '' };
-    };
+
+      if (!sub.length) return [];
+      return [Filters.OR(...sub)];
+    }
+    return [f];
+  });
+};
+
+const transformer = async ({ query }: { query: any }) => {
+  const term = String(
+    (query?.body?.__universal_search_term ??
+     query?.__universal_search_term ??
+     (global as any).__universal_search_term ??
+     '')
+  ).trim();
+
+  const incoming = Array.isArray(query?.filters)
+    ? query.filters
+    : Array.isArray(query?.body?.filters)
+      ? query.body.filters
+      : [];
+
+  const withVirtual = term
+    ? [...incoming, { field: VIRTUAL_FIELD, operator: 'eq', value: term }]
+    : incoming;
+
+  const transformed = transformFilters(withVirtual);
+
+  query.filters = transformed;
+  query.body = { ...(query.body || {}), filters: transformed };
+
+  if (query.body.__universal_search_term !== undefined) {
+    delete query.body.__universal_search_term;
+  }
+
+  return { ok: true, error: '' };
+};
 
     if (!originalBefore) {
       this.resourceConfig.hooks.list.beforeDatasourceRequest = [transformer];

package/package.json

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