@opengis/fastify-table 1.2.82 → 1.2.84

package/package.json

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

package/server/plugins/crud/funcs/utils/logChanges.js

@@ -1,5 +1,5 @@
 import getTemplate from '../../..//table/funcs/getTemplate.js';
-import { metaFormat } from '@opengis/fastify-table/utils.js';
+import metaFormat from '../../../table/funcs/metaFormat/index.js';
 
 const defaultTitles = {
   editor_date: 'Дата оновлення',
@@ -82,11 +82,9 @@ export default async function logChanges({
       .filter(el => schema[el]?.data)
       .reduce((acc, curr) => Object.assign(acc, { [curr]: schema[curr].data }), {});
 
-    if (data) {
-      await metaFormat({ rows: [data], cls, sufix: false });
-    }
+    const data1 = data ? await metaFormat({ rows: [data], cls, sufix: false, reassign: false }) : null;
 
-    const newObj = Object.fromEntries(Object.entries(data || {}).map(el => ([[titles[el[0]] || defaultTitles[el[0]] || el[0]], el[1]])));
+    const newObj = Object.fromEntries(Object.entries(data1 || {}).map(el => ([[titles[el[0]] || defaultTitles[el[0]] || el[0]], el[1]])));
     const changesData = Object.keys(newObj || {}).map(el => ({
       change_id: changeId,
       entity_key: el,

package/server/plugins/table/funcs/getSelectMeta.js

@@ -8,9 +8,21 @@ import getSelect from './getSelect.js';
 const limit = 50;
 const selectMeta = {};
 
-export default async function getSelectMeta({ name, pg = pgClients.client, nocache }) {
+export default async function getSelectMeta({ name, pg = pgClients.client, nocache, table, column, key, val }) {
   if (selectMeta[name] && !nocache) return selectMeta[name];
 
+  if (table && column) {
+    const original = {
+      false: `with c(id,text) as (select ${column || 'row_number() over()'}, ${column}, count(*) from ${table} group by ${column} limit ${limit}) select * from c`,
+      true: `with c(id,text) as (select ${column || 'row_number() over()'}, ${column} from ${table}) select * from c`,
+    }[!!(key || val)];
+    return {
+      original,
+      searchQuery: '(lower("text") ~ $1 )',
+      pk: 'id',
+    };
+  }
+
   const cls = await getSelect(name, pg);
   const db = typeof cls?.db === 'string' ? { database: cls.db } : cls?.db;
   const pg1 = cls?.db ? getPG(db) : pg;

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

@@ -1,3 +1,5 @@
+'use strict';
+
 import { handlebars } from '@opengis/fastify-hb/utils.js';
 
 import getTemplate from '../getTemplate.js';
@@ -5,13 +7,15 @@ import getSelectVal from './getSelectVal.js';
 import pgClients from '../../../pg/pgClients.js';
 
 export default async function metaFormat({
-  rows, table, cls, sufix = true,
+  rows: original, table, cls, sufix = true, reassign = true,
 }, pg = pgClients.client) {
   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) || [];
-  if (!selectCols?.length && !metaCls?.length && !htmlCols?.length) return rows;
+  if (!original?.length || !selectCols?.length && !metaCls?.length && !htmlCols?.length) return original;
+
+  const rows = reassign ? original : JSON.parse(JSON.stringify(original));
 
   await Promise.all(htmlCols.map(async (attr) => {
     await Promise.all(rows.filter(row => row?.[attr.name])?.map(async (row) => {

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

@@ -42,12 +42,7 @@ export default async function suggest(req) {
     return { status: 400, message: 'param limit is invalid' };
   }
 
-  const meta = table && column
-    ? {
-      original: `with c(id,text) as (select ${column || 'row_number() over()'}, ${column}, count(*) from ${tableName} group by ${column} limit ${limit}) select * from c`,
-      searchQuery: '(lower("text") ~ $1 )',
-    }
-    : await getSelectMeta({ pg: pg1, name: selectName, nocache: query?.nocache });
+  const meta = await getSelectMeta({ pg: pg1, name: selectName, nocache: query?.nocache, table, column, key: query?.key, val: query?.val });
 
   if (meta?.minLength && query.key && query.key.length < meta?.minLength) {
     return { message: `min length: ${meta.minLength}` };