@opengis/fastify-table 1.4.49 → 1.4.50

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

@@ -1,9 +1,10 @@
 import { readFileSync } from 'node:fs';
 
 import getMeta from '../../../plugins/pg/funcs/getMeta.js';
-import metaFormat from "../../../plugins/table/funcs/metaFormat/index.js";
-import getTemplatePath from "../../../plugins/table/funcs/getTemplatePath.js";
-import yml2json from "../../../plugins/yml/funcs/yml2json.js";
+import pgClients from '../../../plugins/pg/pgClients.js';
+import metaFormat from '../../../plugins/table/funcs/metaFormat/index.js';
+import getTemplatePath from '../../../plugins/table/funcs/getTemplatePath.js';
+import yml2json from '../../../plugins/yml/funcs/yml2json.js';
 
 const infoList = [];
 
@@ -14,7 +15,7 @@ infoTemplateList?.forEach?.(el => {
 });
 
 export default async function dataInfo({
-  pg = pgClients.client, params = {}, query = {}, user = {},
+  pg = pgClients.client, params = {}, query = {},
 }, reply) {
   const timeStart = Date.now();
   const { id } = params;
@@ -31,18 +32,19 @@ export default async function dataInfo({
   }
 
   const result = await Promise.all(filteredList.filter(el => el.table && pg.pk?.[el.table]).map(async (el) => {
-    const { table, cls } = el;
-    const { rowCount = 0, rows = [] } = await pg.query(`select ${pg.pk?.[el.table]} as id, ${el.columns?.map?.(el => el?.replace?.(/'/g, "''")) || '*'} from ${table} where ${el.query || 'true'} and ${pg.pk?.[table]}=$1`, [id]);
+    const { rowCount = 0, rows = [] } = await pg.query(`select ${pg.pk?.[el.table]} as id, ${el.columns?.map?.(item => item?.replace?.(/'/g, "''")) || '*'} from ${el.table} where ${el.query || 'true'} and ${pg.pk?.[el.table]}=$1`, [id]);
     if (rowCount > 0) {
-      const meta = await getMeta({ pg, table });
+      const meta = await getMeta({ pg, table: el.table });
       const columns = meta?.columns?.filter(item => el.columns?.includes?.(item.name))?.map?.(({ name, title, dataTypeID }) => ({ name, title, type: pg.pgType[dataTypeID] }));
-      return { table, columns, rows, cls, sufix: false };
+      return {
+        table: el.table, columns, rows, cls: el.cls, sufix: false,
+      };
     }
     return null;
   }));
 
   if (!result[0]?.table) {
-    return reply.status(404).send('object not found: ' + id);
+    return reply.status(404).send(`object not found: ${id}`);
   }
 
   await metaFormat(result[0], pg);

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

@@ -1,6 +1,4 @@
-/* import {
-  logger, autoIndex, getSelect, getTemplate, getSelectVal, pgClients, applyHook,
-} from '../../../../utils.js'; */
+/* eslint-disable no-console */
 
 import logger from '../../../plugins/logger/getLogger.js';
 import autoIndex from '../../../plugins/pg/funcs/autoIndex.js';

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

@@ -59,7 +59,7 @@ export default async function tableInfo(req, reply) {
     const interfaceQuery = params?.query ? await handlebars.compile(params?.query)({ user, uid }) : undefined;
     const where = [params.id ? `"${pk}" = $1` : null, loadTable.query, interfaceQuery].filter((el) => el).filter((el) => (user?.user_type === 'superadmin' ? !el.includes('{{uid}}') : true));
 
-    const { fields = [] } = await pg.query(`select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')} limit 0`, ([sqlTable ? null : params.id].filter(el => el)) );
+    const { fields = [] } = await pg.query(`select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')} limit 0`, ([sqlTable ? null : params.id].filter(el => el)));
     const columnList = fields.map(el => el.name);
 
     const metaInfoCols = meta.info.split(',').filter(el => columnList.includes(el)).map((el) => `"${el}"`);

package/server/routes/table/controllers/utils/conditions.js

@@ -11,11 +11,11 @@ function onCheck(rule, data) {
 
     if (rule[1] === '>') return val > rule[2];
     if (rule[1] === '<') return val < rule[2];
+    return null;
 }
 export default function conditions(rules, data) {
     if (!rules?.length) return true;
-    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
+    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data);
     // console.log(rules, result)
     return result;
-
-}
+}

package/server/routes/table/controllers/utils/locales.js

@@ -1 +1 @@
-export default {}
+export default {};

package/server/routes/table/functions/getData.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import config from '../../../../config.js';
 import { handlebars, handlebarsSync } from '../../../helpers/index.js';
 

package/server/routes/util/controllers/status.monitor.js

@@ -1,4 +1,4 @@
-const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024 * 100) / 100} MB`;
+const formatMemoryUsage = (data) => `${Math.round((data / 1024 / 1024) * 100) / 100} MB`;
 
 export default async function statusMonitor() {
   const memoryUsage = process.memoryUsage();