@opengis/fastify-table 1.1.131 → 1.1.132

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.131",
+  "version": "1.1.132",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -133,7 +133,8 @@ function formatValue({
 
   if (['~', '='].includes(operator)) {
     const operator1 = (filterType === 'text' && (filter?.id || filter?.name) && operator === '=' ? '~' : operator);
-    const match = (operator1 === '=' || filterType === 'autocomplete') ? `='${value}'` : `ilike '%${value}%'`;
+    const matchNull = { null: 'is null', notnull: 'is not null' }[value];
+    const match = matchNull || ((operator1 === '=' || filterType === 'autocomplete') ? `='${value}'` : `ilike '%${value}%'`);
     if (extra && pk) {
       const query = data && sql
         ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in ( ( with q(id,name)  as  (${sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'} ${match})))`

package/server/routes/table/controllers/suggest.js

@@ -1,5 +1,5 @@
 import {
-  config, getPG, getTemplate, getSelectMeta, getMeta,
+  config, getPG, getTemplate, getSelectMeta, getMeta, handlebarsSync,
 } from '../../../../utils.js';
 
 const limit = 50;
@@ -61,6 +61,42 @@ export default async function suggest(req) {
 
   const { arr, searchQuery } = meta;
 
+  if (arr && query.token && query.column) {
+    const loadTable = await getTemplate('table', query.token);
+    const { columns = [] } = await getMeta({ table: loadTable?.table || query.token });
+
+    const column = columns.find(el => el.name === query.column);
+    const args = { table: loadTable?.table || query.token };
+
+    const sqlCls = `select array_agg(distinct value) from (select ${pg.pgType[column.dataTypeID].includes('[]') ? `unnest(${column.name})` : `${column.name}`} as value from ${(loadTable?.table || query.token).replace(/'/g, "''")} where ${loadTable?.query || '1=1'})q`;
+
+    if (query.sql && (config.local || user?.user_type?.includes?.('admin'))) {
+      return sqlCls;
+    }
+
+    if (pg.pk?.[loadTable?.table || query.token] && column?.name) {
+      const vals = await pg.queryCache(sqlCls, args).then(el => el.rows?.[0]?.array_agg || []);
+      // console.log(vals);
+
+      const lower = query.key?.toLowerCase();
+      const data1 = query.key || query.val
+        ? arr?.filter((el) => !lower || (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1)?.filter((el) => !query.val || el.id === query.val)
+        : arr;
+
+      const data2 = data1.filter((el) => vals.includes(el.id));
+      const data = data2.slice(0, Math.min(query.limit || limit, limit));
+      return {
+        time: Date.now() - time,
+        limit: Math.min(query.limit || limit, limit),
+        count: data.length,
+        total: arr.length,
+        mode: 'array',
+        sql: (config.local || user?.user_type?.includes?.('admin')) ? sqlCls : undefined,
+        data,
+      };
+    };
+  }
+
   if (arr) {
     const lower = query.key?.toLowerCase();
     const data1 = query.key || query.val
@@ -97,7 +133,7 @@ export default async function suggest(req) {
 
   const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} order by 2) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || '0');
 
-  if (query.sql && config.local) {
+  if (query.sql && (config.local || user?.user_type?.includes?.('admin'))) {
     return sqlSuggest;
   }
 
@@ -105,7 +141,7 @@ export default async function suggest(req) {
   const { rows: dataNew } = await pg.query(sqlSuggest, query.key ? [`${query.key.toLowerCase()}`] : []);
   // const { rows: dataNew1 } = dataNew.length < limit ? await pg.query(sqlSuggest, query.key ? [`${query.key}`] : []) : {};
   const ids = dataNew.map((el) => el.id);
-  const data = dataNew.concat((/* dataNew1 || */ []).filter((el) => !ids?.includes(el.id)));
+  const data = dataNew.concat((/* dataNew1 || */[]).filter((el) => !ids?.includes(el.id)));
 
   const message = {
     time: Date.now() - time,
@@ -114,7 +150,7 @@ export default async function suggest(req) {
     total: meta.count - 0,
     mode: 'sql',
     db: meta.db,
-    sql: config.local ? sqlSuggest : undefined,
+    sql: (config.local || user?.user_type?.includes?.('admin')) ? sqlSuggest : undefined,
     data,
   };