@opengis/fastify-table 1.2.45 → 1.2.47

package/package.json

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

package/server/plugins/extra/extraDataGet.js

@@ -1,4 +1,4 @@
-import { config, getTemplate, pgClients, getMeta } from "../../../utils.js";
+import { config, getTemplate, pgClients } from "../../../utils.js";
 
 const defaultTable = 'crm.extra_data';
 
@@ -11,48 +11,42 @@ function format(key, value, schema) {
 }
 
 export default async function extraDataGet({
-  table: mainTable, form, id,
+  rows = [], table, form,
 }, pg = pgClients.client) {
-  if (!id || !form || !mainTable) {
+  const ids = rows.map(row => row.id).filter(el => el);
+
+  if (!ids?.length || !form || !table) {
     return null;
   }
 
   const loadTemplate = await getTemplate('form', form);
   if (!loadTemplate?.extra) return null;
 
-  const table = config.extraData?.[mainTable]
-    || config.extraData?.[mainTable.split('.').shift()]
+  const extraDataTable = config.extraData?.[table]
+    || config.extraData?.[table.split('.').shift()]
     || config.extraData?.['default']
     || config.extraData
     || defaultTable;
 
-  const { pk: mainPK } = await getMeta({ pg, table: mainTable });
-  const { pk, columns: extraColumns = [] } = await getMeta({ pg, table });
-
-  if (!mainPK) {
-    return { error: `table pk not found: ${mainTable}`, status: 404 };
+  if (!pg.pk?.[table]) {
+    return { error: `table pk not found: ${table}`, status: 404 };
   }
 
-  if (!pk) {
-    return { error: `extra table pk not found: ${table}`, status: 404 };
+  if (!pg.pk?.[extraDataTable]) {
+    return { error: `extra table pk not found: ${extraDataTable}`, status: 404 };
   }
 
-  const mode = extraColumns.find((col) => col?.name === mainPK)
-    ? 'column'
-    : 'property';
-
-  const { rows = [] } = await pg.query(`select * from ${table} where ${mode === 'column' ? mainPK : 'object_id'}=$1`, [id]);
-
-  if (mode === 'column') {
-    const res = Object.keys(rows[0] || {})
-      .map(key => [key, format(key, rows?.[0]?.[key], loadTemplate?.schema)])
-      .filter(el => el[1])
-      .reduce((acc, curr) => Object.assign(acc, { [curr[0]]: curr[1] }), {});
-    Object.assign(res, { id: rows?.[0]?.[pg.pk?.[mainTable || '']] });
-    return res;
+  const { rows: extraRows = [] } = await pg.query(`select * from ${extraDataTable} where object_id=any($1::text[])`, [ids]);
+
+  if (rows?.length && extraRows?.length) {
+    rows.forEach(row => {
+      Object.assign(row, {
+        ...extraRows
+          .filter(el => el.object_id === row.id)
+          .reduce((acc, curr) => Object.assign(acc, {
+            [curr.property_key]: format(curr.property_key, curr.value_text, loadTemplate?.schema)
+          }), {})
+      });
+    });
   }
-
-  const res = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: format(curr.property_key, curr.value_text, loadTemplate?.schema) }), {});
-  Object.assign(res, { id: rows?.[0].object_id });
-  return res;
 };

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,
   };
 }
 
@@ -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

@@ -162,14 +162,7 @@ export default async function dataAPI(req, reply, called) {
   const { total, filtered } = counts || {};
   const agg = Object.keys(counts).filter(el => !['total', 'filtered'].includes(el)).reduce((acc, el) => ({ ...acc, [el]: counts[el] }), {});
 
-  if (hookData?.id || params.id) {
-    const extraData = await extraDataGet({
-      table: loadTable?.table,
-      id: hookData?.id || params.id,
-      form,
-    }, pg);
-    Object.assign(rows[0] || {}, { ...extraData || {} });
-  }
+  await extraDataGet({ rows, table: loadTable?.table, form }, pg);
 
   await metaFormat({ rows, table: tokenData?.table || hookData?.table || params.table }, pg);