@opengis/fastify-table 1.1.96 → 1.1.97

package/package.json

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

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

@@ -14,7 +14,7 @@ export default async function getSelect(name, pg = pgClients.client) {
   const clsDataGIT = await getTemplate(['cls', 'select'], name);
   const { type } = !clsDataGIT && pg.pk?.['admin.cls'] ? await pg.query('select type from admin.cls where parent is null and name=$1 limit 1', [name]).then(el => el.rows?.[0] || {}) : {};
   const q = !clsDataGIT && type && ['sql', 'json'].includes(type) ? sqls[type] : undefined;
-  const clsDataDB = q ? await pg.query(q, [name]).then(el => el.rows?.[0]?.data) : {};
+  const clsDataDB = q ? await pg.query(q, [name]).then(el => el.rows?.[0]?.data) : undefined;
   const clsData = clsDataGIT || clsDataDB;
   if (!clsData) return null;
 

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

@@ -63,8 +63,15 @@ export default async function gisIRColumn({
     pg, name: cls, values: rows.map((el) => el.id), ar: 1,
   });
   rows.forEach((el) => {
-    const data = select?.arr ? select.arr?.find((item) => item.id?.toString() === el.id?.toString()) : undefined;
-    Object.assign(el, data || {});
+    if (Array.isArray(select)) {
+      Object.assign(el, select.find((item) => item.id?.toString() === el.id?.toString()) || {});
+    }
+    else if (typeof select?.[el.id] === 'string') {
+      Object.assign(el, { text: select?.[el.id] });
+    }
+    else {
+      Object.assign(el, select?.[el.id] || {});
+    }
   });
   return {
     time: Date.now() - time,

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

@@ -3,15 +3,18 @@ import pgClients from '../../../pg/pgClients.js';
 import redis from '../../../redis/client.js';
 
 const selectIds = {};
-export default async function getSelectVal({ pg = pgClients.client, name, values: valuesOrigin }) {
+export default async function getSelectVal({
+  pg = pgClients.client, name, values: valuesOrigin, ar = false,
+}) {
   if (!valuesOrigin?.length) return null;
   const values = valuesOrigin.map(el => el.toString());
   const cls = await getSelect(name, pg);
 
   // === array  ===
   if (cls?.arr && Array.isArray(cls?.arr)) {
-    //  console.log(name, cls?.arr, values);
-    return cls.arr.filter(el => values.includes(el.id.toString())).reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {});
+    const resultArr = cls.arr.filter(el => values.includes(el.id.toString()));
+    if (ar) return resultArr;
+    return resultArr.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {});
   }
 
   // === sql ===
@@ -30,9 +33,18 @@ export default async function getSelectVal({ pg = pgClients.client, name, values
   const q = `with c(id,text) as (select * from (${cls.sql})q where ${id} = any('{${filteredValues}}')) select * from c`;
   const data = filteredValues.length ? await pg.query(q).then(el => el.rows) : [];
 
-  const clsAr = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };
+  const clsObj = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };
+
   if (data?.length) {
-    redis.hmset(key, clsAr);
+    redis.hmset(key, clsObj);
+  }
+
+  if (ar) {
+    return Object.keys(clsObj).reduce((acc, el) => {
+      acc.push({ id: el, text: typeof clsObj[el] === 'string' ? clsObj[el] : clsObj[el]?.text, color: clsObj[el]?.color });
+      return acc;
+    }, []);
   }
-  return clsAr;
+
+  return clsObj;
 }