@opengis/fastify-table 1.1.113 → 1.1.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.113",
+  "version": "1.1.115",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

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

@@ -3,16 +3,16 @@ import { handlebars } from '@opengis/fastify-hb/utils.js';
 import getTemplate from '../getTemplate.js';
 import getSelectVal from './getSelectVal.js';
 
-// import { getTemplate, getSelectVal } from '../../../../../utils.js';
-
-export default async function metaFormat({ rows, table }) {
-  const loadTable = await getTemplate('table', table);
-  const selectCols = loadTable?.columns?.filter((e) => e.data);
+export default async function metaFormat({
+  rows, table, cls, sufix = true,
+}) {
+  const loadTable = table ? await getTemplate('table', table) : {};
+  const selectCols = Object.keys(cls || {}).map(key => ({ name: key, data: cls[key] })).concat(loadTable?.columns?.filter((e) => e.data) || []);
   const metaCls = Object.keys(loadTable?.meta?.cls || {}).map((el) => ({ name: el, data: loadTable?.meta?.cls[el] }));
-  const htmlCols = loadTable?.columns?.filter((e) => e.name && e.format === 'html' && e.html);
+  const htmlCols = loadTable?.columns?.filter?.((e) => e.name && e.format === 'html' && e.html) || [];
   if (!selectCols?.length && !metaCls?.length && !htmlCols?.length) return rows;
 
-  await Promise.all(htmlCols?.map(async (attr) => {
+  await Promise.all(htmlCols.map(async (attr) => {
     await Promise.all(rows.filter(row => row?.[attr.name])?.map(async (row) => {
       const html = await handlebars.compile(attr.html)(row);
       Object.assign(row, { [attr.name]: html?.replaceAll(/<[^>]*>/g, '')?.replace(/\n/g, '')?.trim() });
@@ -24,13 +24,18 @@ export default async function metaFormat({ rows, table }) {
     const values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => (typeof el === 'boolean' ? true : el));
     if (!values.length) return null;
 
-    const cls = await getSelectVal({ name: attr.data, values });
-    if (!cls) return null;
+    const clsValues = await getSelectVal({ name: attr.data, values });
+    if (!clsValues) return null;
 
     rows.forEach(el => {
-      const val = el[attr.name]?.map?.(c => cls[c.toString()] || cls[c] || c) || cls[el[attr.name]?.toString()] || cls[el[attr.name]] || el[attr.name];
+      const val = el[attr.name]?.map?.(c => clsValues[c.toString()] || clsValues[c] || c) || clsValues[el[attr.name]?.toString()] || clsValues[el[attr.name]] || el[attr.name];
       if (!val) return;
-      Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
+      if (!sufix) {
+        Object.assign(el, { [attr.name]: val.text || val });
+      }
+      else {
+        Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
+      }
     });
 
     return null;

package/server/routes/crud/controllers/update.js

@@ -73,11 +73,13 @@ export default async function update(req) {
       // delete old extra data
       await pgClients.client.query(`delete from ${schema[key].table} where ${schema[key].parent_id}=$1`, [objId]); // rewrite?
       // insert new extra data
-      const extraRows = await Promise.all(body[key].map(async (row) => {
-        const extraRes = await dataInsert({ table: schema[key].table, data: { ...row, [schema[key].parent_id]: objId }, uid });
-        return extraRes?.rows?.[0];
-      }));
-      Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });
+      if (Array.isArray(body[key]) && body[key]?.length) {
+        const extraRows = await Promise.all(body[key]?.map?.(async (row) => {
+          const extraRes = await dataInsert({ table: schema[key].table, data: { ...row, [schema[key].parent_id]: objId }, uid });
+          return extraRes?.rows?.[0];
+        }));
+        Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });
+      }
     }));
   }