@opengis/fastify-table 1.1.107 → 1.1.109

package/package.json

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

package/server/migrations/users.sql

@@ -20,6 +20,7 @@ ALTER TABLE admin.users add column if not exists user_personal_code text;
 ALTER TABLE admin.users add column if not exists last_activity_date timestamp without time zone;
 ALTER TABLE admin.users add column if not exists user_type text DEFAULT 'regular'::text;
 ALTER TABLE admin.users add column if not exists user_rnokpp text;
+ALTER TABLE admin.users alter column user_rnokpp drop not null;
 ALTER TABLE admin.users add column if not exists salt text;
 ALTER TABLE admin.users add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
 ALTER TABLE admin.users add column if not exists editor_id text;

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

@@ -1,3 +1,5 @@
+import { handlebars } from '@opengis/fastify-hb/utils.js';
+
 import getTemplate from '../getTemplate.js';
 import getSelectVal from './getSelectVal.js';
 
@@ -7,8 +9,15 @@ export default async function metaFormat({ rows, table }) {
   const loadTable = await getTemplate('table', table);
   const selectCols = loadTable?.columns?.filter((e) => e.data);
   const metaCls = Object.keys(loadTable?.meta?.cls || {}).map((el) => ({ name: el, data: loadTable?.meta?.cls[el] }));
-  if (!selectCols?.length && !metaCls?.length) return rows;
-
+  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(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() });
+    }));
+  }));
   // cls & select format
 
   await Promise.all(selectCols.concat(metaCls)?.map(async (attr) => {

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

@@ -1,5 +1,6 @@
 import {
   applyHook, getAccess, getTemplate, checkXSS, dataInsert, getToken, config,
+  pgClients,
 } from '../../../../utils.js';
 
 export default async function insert(req) {
@@ -61,7 +62,8 @@ export default async function insert(req) {
     table, token: params?.table, body, payload: res, user,
   });
   // form DataTable
-  const extraKeys = Object.keys(schema || {})?.filter((key) => schema?.[key]?.type === 'DataTable' && schema?.[key]?.table && schema?.[key]?.parent_id && body[key].length);
+  const extraKeys = Object.keys(schema || {})?.filter((key) => schema?.[key]?.type === 'DataTable' && schema?.[key]?.table && schema?.[key]?.parent_id && body[key]?.length);
+
   if (extraKeys?.length) {
     res.extra = {};
     await Promise.all(extraKeys?.map(async (key) => {
@@ -76,5 +78,6 @@ export default async function insert(req) {
     }));
   }
 
-  return { rows: res.rows, extra: res.extra };
+  const pk = pgClients.client?.pk?.[loadTemplate?.table || table];
+  return { id: res?.rows?.[0]?.[pk], rows: res.rows, extra: res.extra };
 }