@opengis/fastify-table 1.2.50 → 1.2.51

package/package.json

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

package/server/plugins/table/funcs/getFilterSQL/index.js

@@ -1,131 +1,133 @@
-import getTemplate from '../getTemplate.js';
-import pgClients from '../../../pg/pgClients.js';
-import config from '../../../../../config.js';
-
-// filter util
-import getTableSql from './util/getTableSql.js';
-import getFilterQuery from './util/getFilterQuery.js';
-import getOptimizedQuery from './util/getOptimizedQuery.js';
-
-const defaultTable = 'crm.extra_data';
-
-function getExtraQuery(mainColumns, extraColumns, schema, table, pk, mode = 'property') {
-  const extraKeys = mode === 'column'
-    ? Object.keys(schema || {}).filter(key => !mainColumns.map(el => el?.name).includes(key) && extraColumns.map(el => el?.name).includes(key))
-    : Object.keys(schema || {}).filter(key => !mainColumns.map(el => el?.name).includes(key));
-
-  if (mode === 'column') {
-    return { q: `left join lateral (select ${extraKeys.map(key => `"${key}"`).join(',')} from ${table} where ${pk}=t.${pk} limit 1) extra on 1=1`, extraKeys };
-  }
-  return {
-    q: extraKeys.map((el, idx) => `left join lateral (select value_text as "${el.replace(/'/g, "''")}" from ${table} where property_key='${el.replace(/'/g, "''")}' and object_id=t.${pk} limit 1) extra${idx} on 1=1`).join(' '),
-    extraKeys,
-  };
-}
-
-export default async function getFilterSQL({
-  table, filter, pg = pgClients.client, search, filterList, query, custom, state,
-}) {
-  if (!table) return { error: 'param table is required', status: 400 };
-
-  const body = await getTemplate('table', table);
-  const loadTemplate = body?.form ? await getTemplate('form', body?.form) : null;
-  const { extra } = loadTemplate || {};
-
-  const extraDataTable = extra
-    ? config.extraData?.[body.table]
-    || config.extraData?.[body.table.split('.').shift()]
-    || config.extraData?.['default']
-    || config.extraData
-    || defaultTable
-    : undefined;
-
-  const { fields: fieldsExtra = [] } = pg.pk?.[extraDataTable] ? await pg.query(`select * from ${extraDataTable} limit 0`) : {};
-  const mode = fieldsExtra.find((col) => col?.name === pg.pk?.[body?.table || table]) ? 'column' : 'property';
-
-  const { fields: fieldsModel = [] } = body?.table && pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
-  const { q: extraSqlList, extraKeys } = pg.pk?.[extraDataTable] && pg.pk?.[body?.table]
-    ? getExtraQuery(fieldsModel, fieldsExtra, loadTemplate?.schema, extraDataTable, pg.pk[body?.table || table], mode)
-    : {};
-
-  // console.log('extra getFilterSQL', extraDataTable, pg.pk?.[extraDataTable]);
-
-  const sqlList = body?.sql?.length
-    ? body?.sql?.filter((el) => !el.disabled && el?.sql?.replace)
-      .map((el, i) => {
-        Object.assign(el, { name: el.name || `t${i + 1}` });
-        return ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `;
-      }).join(' ')
-    : '';
-  const fieldQuery = `select * from ${body?.table || table} t ${sqlList || ''} ${extraSqlList || ''} limit 0`;
-  const { fields = [] } = !extra || mode === 'column' ? await pg.query(fieldQuery) : { fields: extraKeys.map(el => ({ name: el.name, dataTypeID: 25 })) };
-  const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
-  const searchColumn = body?.search_column || body?.meta?.search || autoSearchColumn;
-  const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
-  try {
-    const tableSQL = await getTableSql({
-      pg, body, table, fields,
-    });
-    const sval = `ilike '%${decodeURIComponent(search?.replace(/%/g, '%25')).replace(/'/g, "''").replace(/%/g, '\\%')}%'`;
-    const searchQuery = search && searchColumn
-      ? ` (${searchColumn.split(',')?.map((name) => {
-        const { pk } = tableSQL.find((el) => el.name === name) || {};
-        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery.replace(/limit 0/g, '')} where ${name} ${sval} )q where 1=1)` : `${name} ${sval}`;
-      }).join(' or ')} )` : '';
-
-    const filterList1 = await Promise.all((filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || [])
-      .concat(body?.filters || [])).concat(body?.filterSql || []) /* .concat(extraFilters || []).concat(customFilters || []) */
-
-      ?.map(async (el) => {
-        if (el.name && extraKeys?.includes?.(el.name)) {
-          Object.assign(el, { extra: { table: extraDataTable, mode } });
-        }
-        if (!el?.data) return el;
-        const cls = await getTemplate(['cls', 'select'], el.data);
-        if (Array.isArray(cls) && cls?.length) {
-          Object.assign(el, { options: cls });
-        }
-        else if (typeof (cls?.sql || cls) === 'string') {
-          Object.assign(el, { sql: cls?.sql || cls });
-        }
-        return el;
-      }));
-
-    const filters = getFilterQuery({
-      pg,
-      filter,
-      table: body?.table || table,
-      tableSQL,
-      fields,
-      filterList: filterList1,
-    });
-
-    // filter
-    const customQuery = body?.filterCustom?.length && custom ? body.filterCustom?.find((el) => el.name === custom)?.sql : null;
-    const stateQuery = body?.filterState?.length && state ? body.filterState?.find((el) => el.name === state)?.sql : null;
-
-    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query} `).join(' and ');
-    const q = [body?.query, query, searchQuery, filterQuery, stateQuery, customQuery].filter((el) => el).join(' and ');
-
-    // table
-    const modelQuery = body?.model || body?.table || table;
-    const optimizedSQL = `select * from ${getOptimizedQuery({ body, extraSqlList, table, q })} `;
-    const tableCount = getOptimizedQuery({ body, extraSqlList, table, q }, true);
-    // console.log(optimizedSQL);
-    return {
-      filterList,
-
-      q,
-      optimizedSQL,
-      extraSqlList,
-      extraKeys,
-      tableCount,
-      table: modelQuery,
-      // filter parts
-      searchQuery,
-    };
-  }
-  catch (err) {
-    throw new Error(err.toString());
-  }
-}
+import getTemplate from '../getTemplate.js';
+import pgClients from '../../../pg/pgClients.js';
+import config from '../../../../../config.js';
+
+// filter util
+import getTableSql from './util/getTableSql.js';
+import getFilterQuery from './util/getFilterQuery.js';
+import getOptimizedQuery from './util/getOptimizedQuery.js';
+
+const defaultTable = 'crm.extra_data';
+
+function getExtraQuery(mainColumns, extraColumns, schema, table, pk, mode = 'property') {
+  const extraKeys = mode === 'column'
+    ? Object.keys(schema || {}).filter(key => !mainColumns.map(el => el?.name).includes(key) && extraColumns.map(el => el?.name).includes(key))
+    : Object.keys(schema || {}).filter(key => !mainColumns.map(el => el?.name).includes(key));
+
+  if (mode === 'column') {
+    return { q: `left join lateral (select ${extraKeys.map(key => `"${key}"`).join(',')} from ${table} where ${pk}=t.${pk} limit 1) extra on 1=1`, extraKeys };
+  }
+  return {
+    q: extraKeys.map((el, idx) => `left join lateral (select value_text as "${el.replace(/'/g, "''")}" from ${table} where property_key='${el.replace(/'/g, "''")}' and object_id=t.${pk} limit 1) extra${idx} on 1=1`).join(' '),
+    extraKeys,
+  };
+}
+
+export default async function getFilterSQL({
+  table, filter, pg = pgClients.client, search, filterList, query, custom, state,
+}) {
+  if (!table) return { error: 'param table is required', status: 400 };
+
+  const body = await getTemplate('table', table);
+  const loadTemplate = body?.form ? await getTemplate('form', body?.form) : null;
+  const { extra } = loadTemplate || {};
+
+  const extraDataTable = extra
+    ? config.extraData?.[body.table]
+    || config.extraData?.[body.table.split('.').shift()]
+    || config.extraData?.['default']
+    || config.extraData
+    || defaultTable
+    : undefined;
+
+  const { fields: fieldsExtra = [] } = pg.pk?.[extraDataTable] ? await pg.query(`select * from ${extraDataTable} limit 0`) : {};
+  const mode = fieldsExtra.find((col) => col?.name === pg.pk?.[body?.table || table]) ? 'column' : 'property';
+
+  const { fields: fieldsModel = [] } = body?.table && pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
+  const { q: extraSqlList, extraKeys } = pg.pk?.[extraDataTable] && pg.pk?.[body?.table]
+    ? getExtraQuery(fieldsModel, fieldsExtra, loadTemplate?.schema, extraDataTable, pg.pk[body?.table || table], mode)
+    : {};
+
+  // console.log('extra getFilterSQL', extraDataTable, pg.pk?.[extraDataTable]);
+
+  const sqlList = body?.sql?.length
+    ? body?.sql?.filter((el) => !el.disabled && el?.sql?.replace)
+      .map((el, i) => {
+        Object.assign(el, { name: el.name || `t${i + 1}` });
+        return ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `;
+      }).join(' ')
+    : '';
+  const fieldQuery = `select * from ${body?.table || table} t ${sqlList || ''} ${extraSqlList || ''} limit 0`;
+  const { fields = [] } = !extra || mode === 'column' ? await pg.query(fieldQuery) : { fields: extraKeys.map(el => ({ name: el.name, dataTypeID: 25 })) };
+  const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
+  const searchColumn = body?.search_column || body?.meta?.search || autoSearchColumn;
+  const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
+  try {
+    const tableSQL = await getTableSql({
+      pg, body, table, fields,
+    });
+    const sval = `ilike '%${decodeURIComponent(search?.replace(/%/g, '%25')).replace(/'/g, "''").replace(/%/g, '\\%')}%'`;
+    const searchQuery = search && searchColumn
+      ? ` (${searchColumn.split(',')?.map((name) => {
+        const { pk } = tableSQL.find((el) => el.name === name) || {};
+        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery.replace(/limit 0/g, '')} where ${name} ${sval} )q where 1=1)` : `${name} ${sval}`;
+      }).join(' or ')} )` : '';
+
+    body?.filterSql?.forEach?.((el) => Object.assign(el, { filtersql: 1 }));
+
+    const filterList1 = await Promise.all((filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || [])
+      .concat(body?.filters || [])).concat(body?.filterSql || []) /* .concat(extraFilters || []).concat(customFilters || []) */
+
+      ?.map(async (el) => {
+        if (el.name && extraKeys?.includes?.(el.name)) {
+          Object.assign(el, { extra: { table: extraDataTable, mode } });
+        }
+        if (!el?.data) return el;
+        const cls = await getTemplate(['cls', 'select'], el.data);
+        if (Array.isArray(cls) && cls?.length) {
+          Object.assign(el, { options: cls });
+        }
+        else if (typeof (cls?.sql || cls) === 'string') {
+          Object.assign(el, { sql: cls?.sql || cls });
+        }
+        return el;
+      }));
+
+    const filters = getFilterQuery({
+      pg,
+      filter,
+      table: body?.table || table,
+      tableSQL,
+      fields,
+      filterList: filterList1,
+    });
+
+    // filter
+    const customQuery = body?.filterCustom?.length && custom ? body.filterCustom?.find((el) => el.name === custom)?.sql : null;
+    const stateQuery = body?.filterState?.length && state ? body.filterState?.find((el) => el.name === state)?.sql : null;
+
+    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query} `).join(' and ');
+    const q = [body?.query, query, searchQuery, filterQuery, stateQuery, customQuery].filter((el) => el).join(' and ');
+
+    // table
+    const modelQuery = body?.model || body?.table || table;
+    const optimizedSQL = `select * from ${getOptimizedQuery({ body, extraSqlList, table, q })} `;
+    const tableCount = getOptimizedQuery({ body, extraSqlList, table, q }, true);
+    // console.log(optimizedSQL);
+    return {
+      filterList,
+
+      q,
+      optimizedSQL,
+      extraSqlList,
+      extraKeys,
+      tableCount,
+      table: modelQuery,
+      // filter parts
+      searchQuery,
+    };
+  }
+  catch (err) {
+    throw new Error(err.toString());
+  }
+}

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

@@ -25,7 +25,7 @@ function formatDateISOString(date) {
 function formatValue({
   pg, table, filter = {}, name, value, operator = '=', dataTypeID, uid = 1, optimize,
 }) {
-  const { data, sql, extra } = filter;
+  const { data, sql, extra, filtersql } = filter;
   const pk = pg?.pk && table ? pg.pk[table] : undefined;
 
   if (!dataTypeID && !extra) return {};
@@ -36,7 +36,7 @@ function formatValue({
   const filterType = filter.type?.toLowerCase();
 
   // body.filterSql
-  if (sql && !data) {
+  if (sql && filtersql) {
     // date range
     if (filterType === 'date') {
       const [startDate, endDate] = value.split('-');