@opengis/fastify-table 1.2.44 → 1.2.46

package/package.json

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

package/server/plugins/extra/extraData.js

@@ -69,6 +69,7 @@ export default async function extraData({
   const rows = Object.keys(data || {})
     .filter(key => Object.keys(loadTemplate?.schema || {}).includes(key))
     .filter(key => !mainColumns.map(el => el.name).concat('id', 'token').includes(key))
+    .filter(key => Array.isArray(data[key]) ? data[key].length : true)
     .map(key => ({
       object_id: id,
       property_key: key,

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

@@ -10,13 +10,16 @@ import getOptimizedQuery from './util/getOptimizedQuery.js';
 const defaultTable = 'crm.extra_data';
 
 function getExtraQuery(mainColumns, extraColumns, schema, table, pk, mode = 'property') {
-  const keysExtra = Object.keys(schema || {}).filter(key => !mainColumns.map(el => el?.name).includes(key) && extraColumns.map(el => el?.name).includes(key));
+  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 ${keysExtra.map(key => `"${key}"`).join(',')} from ${table} where ${pk}=t.${pk} limit 1) extra on 1=1`, keysExtra };
+    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: `left join lateral (select ${keysExtra.map(key => `"${key}"`).join(',')} from ${table} where ${pk}=t.${pk} limit 1) extra on 1=1`,
-    keysExtra,
+    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,
   };
 }
 
@@ -31,7 +34,7 @@ export default async function getFilterSQL({
 
   const extraDataTable = extra
     ? config.extraData?.[body.table]
-    || config.extraData?.[mainTable.split('.').shift()]
+    || config.extraData?.[body.table.split('.').shift()]
     || config.extraData?.['default']
     || config.extraData
     || defaultTable
@@ -41,7 +44,7 @@ export default async function getFilterSQL({
   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, keysExtra } = pg.pk?.[extraDataTable] && pg.pk?.[body?.table]
+  const { q: extraSqlList, extraKeys } = pg.pk?.[extraDataTable] && pg.pk?.[body?.table]
     ? getExtraQuery(fieldsModel, fieldsExtra, loadTemplate?.schema, extraDataTable, pg.pk[body?.table || table], mode)
     : {};
 
@@ -55,7 +58,7 @@ export default async function getFilterSQL({
       }).join(' ')
     : '';
   const fieldQuery = `select * from ${body?.table || table} t ${sqlList || ''} ${extraSqlList || ''} limit 0`;
-  const { fields = [] } = await pg.query(fieldQuery);
+  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);
@@ -74,7 +77,7 @@ export default async function getFilterSQL({
       .concat(body?.filters || [])) /* .concat(extraFilters || []).concat(customFilters || []) */
 
       ?.map(async (el) => {
-        if (el.name && keysExtra?.includes?.(el.name)) {
+        if (el.name && extraKeys?.includes?.(el.name)) {
           Object.assign(el, { extra: { table: extraDataTable, mode } });
         }
         if (!el?.data) return el;
@@ -114,6 +117,8 @@ export default async function getFilterSQL({
 
       q,
       optimizedSQL,
+      extraSqlList,
+      extraKeys,
       tableCount,
       table: modelQuery,
       // filter parts

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

@@ -80,7 +80,7 @@ export default async function dataAPI(req, reply, called) {
     });
   }
 
-  const checkFilter = [query.filter, query.search, query.state, query.custom].filter((el) => el).length;
+  const checkFilter = [query.filter, query.search, query.state, query.custom, loadTable?.extra].filter((el) => el).length;
   const fData = checkFilter ? await getFilterSQL({
     pg,
     table: params.table,
@@ -119,7 +119,7 @@ export default async function dataAPI(req, reply, called) {
                      
                      ${dbColumns.find((el) => el.name === 'geom' && pg.pgType?.[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : ''} 
                      from (select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')}  ${order}) t 
-                     ${sqlTable} 
+                     ${sqlTable} ${loadTable?.extra && fData?.extraSqlList ? fData?.extraSqlList : ''} 
                      ${params.id ? cardSqlTable : ''} 
                      where ${where.join(' and ') || 'true'} 
                      ${order} ${offset}  limit ${limit}`