@opengis/fastify-table 1.4.27 → 1.4.29

package/package.json

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

package/server/plugins/file/isFileExists.js

@@ -1,7 +1,7 @@
-import path from 'path';
+import path from 'node:path';
 import providers from './providers/index.js';
 
-async function isFileExists(filePath, options = { }) {
+async function isFileExists(filePath, options = {}) {
   const filename = path.basename(filePath);
 
   // prefix

package/server/plugins/file/uploadMultiPart.js

@@ -1,9 +1,10 @@
 import path from 'node:path';
 import { mkdir } from 'node:fs/promises';
 
-import { config } from '../../../utils.js';
+import config from '../../../config.js';
 
 import providers from './providers/index.js';
+
 import uploadFileDisk from './utils/uploadFileDisk.js';
 
 import { all, images } from './utils/allowedExtensions.js';

package/server/plugins/file/utils/getPath.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 
-import { config } from '../../../../utils.js';
+import config from '../../../../config.js';
 
 function getPath(filepath, options = {}) {
   if (typeof filepath !== 'string') return null;

package/server/plugins/file/utils/isFileExists.js

@@ -1,4 +1,5 @@
 import { access } from 'node:fs/promises';
+
 import getPath from './getPath.js';
 
 const isFileExists = async (filepath, options = {}) => {

package/server/plugins/file/utils/uploadFileDisk.js

@@ -4,7 +4,7 @@ import { rename, readFile, writeFile } from 'node:fs/promises';
 import { formidable } from 'formidable';
 import { imageSize } from 'image-size';
 
-import { config } from '../../../../utils.js';
+import config from '../../../../config.js';
 
 import { images } from './allowedExtensions.js';
 import grpc from '../../grpc/grpc.js';

package/server/plugins/grpc/grpc.js

@@ -2,7 +2,8 @@
 import grpc from '@grpc/grpc-js';
 import protoLoader from '@grpc/proto-loader';
 
-import { config, logger } from '../../../utils.js';
+import config from '../../../config.js';
+import logger from '../logger/getLogger.js';
 
 config.ready = config.ready || {};
 

package/server/plugins/grpc/office2pdf.js

@@ -2,7 +2,8 @@
 import grpc from '@grpc/grpc-js';
 import protoLoader from '@grpc/proto-loader';
 
-import { config, logger } from '../../../utils.js';
+import config from '../../../config.js';
+import logger from '../logger/getLogger.js';
 
 config.ready = config.ready || {};
 

package/server/routes/file/controllers/export.js

@@ -9,12 +9,18 @@ import {
   mkdir, readFile, rm, writeFile,
 } from 'node:fs/promises';
 
-import {
-  config, logger, getTemplate, getMeta, getFolder, pgClients, eventStream, getData, metaFormat,
-} from '../../../../utils.js';
-
-import convertJSONToXls from './utils/convertJSONToXls.js';
-import convertJSONToCSV from './utils/convertJSONToCSV.js';
+import config from '../../../../config.js';
+import logger from '../../../plugins/logger/getLogger.js';
+import getTemplate from '../../../plugins/table/funcs/getTemplate.js';
+import getMeta from '../../../plugins/pg/funcs/getMeta.js';
+import pgClients from '../../../plugins/pg/pgClients.js';
+import eventStream from '../../../plugins/util/funcs/eventStream.js';
+import getData from '../../table/functions/getData.js';
+import getFolder from '../../../plugins/crud/funcs/utils/getFolder.js';
+import metaFormat from '../../../plugins/table/funcs/metaFormat/index.js';
+
+import jsonToXls from './utils/jsonToXls.js';
+import jsonToCsv from './utils/jsonToCsv.js';
 import formatResult from './utils/formatResult.js';
 
 const startStreamWithTotal = 10000;
@@ -262,12 +268,12 @@ export default async function exportTable({
   const resp = {};
 
   if (format === 'csv') {
-    await convertJSONToCSV({
+    await jsonToCsv({
       filePath: filePathJSON, send, colmodel, domain: host, source, columnList,
     });
   }
   if (format === 'xlsx') {
-    await convertJSONToXls({
+    await jsonToXls({
       filePath: filePathJSON, send, colmodel, domain: host, source, resp,
     });
   }

package/server/routes/file/controllers/utils/{convertJSONToXls.js → jsonToXls.js}

@@ -1,8 +1,7 @@
 import path from 'node:path';
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 
-import { logger } from '../../../../../utils.js';
-
+import logger from '../../../../plugins/logger/getLogger.js';
 import grpc from '../../../../plugins/grpc/grpc.js';
 
 const { jsonToXls } = grpc();

package/server/routes/menu/controllers/getMenu.js

@@ -4,9 +4,10 @@
 import { join } from 'node:path';
 import { existsSync, readdirSync, readFileSync } from 'node:fs';
 
-import {
-    menuDirs, pgClients, applyHook, config,
-} from '../../../../utils.js';
+import config from '../../../../config.js';
+import pgClients from '../../../plugins/pg/pgClients.js';
+import applyHook from '../../../plugins/hook/funcs/applyHook.js';
+import menuDirs from '../../../plugins/table/funcs/menuDirs.js';
 
 const menuCache = [];
 

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

@@ -50,31 +50,7 @@ export default async function getCardData(req, reply) {
         return reply.status(403).send('access restricted: empty rows');
     }
 
-    const { rows = [] } = result;
-
-    // conditions
-    index.panels?.filter(el => el.items).forEach(el1 => {
-        el1.items = el1.items?.filter(item => conditions(item.conditions, rows[0]));
-    });
-
-    // title, count
-    index.panels?.filter(el => el.items).forEach(async el => {
-        const filtered = el.items.filter(item => item.count?.toLowerCase?.().includes('select'));
-
-        const data = await Promise.all(filtered.map(el1 => pg.query(el1.count).then(item => item.rows?.[0] || {})));
-
-        filtered.forEach((item1, i) => {
-            Object.assign(item1, data[i] || {}, data[i].count ? {} : { count: undefined });
-        });
-
-        const q = el.items.map((item2) => (item2.component ? components[item2.component] : null)).filter(item2 => item2).join(' union all ');
-
-        const counts = q && id
-            ? await pg.query(q, [id])
-                .then(e => e.rows.reduce((acc, curr) => Object.assign(acc, { [curr.component]: curr.count }), {}))
-            : {};
-        el.items?.filter?.(item => item.component)?.forEach(item => Object.assign(item, { count: counts?.[item.component] }));
-    });
+    const { rows = [], panels } = result;
 
     // tokens result
     const tokens = {};
@@ -137,6 +113,7 @@ export default async function getCardData(req, reply) {
     return {
         time: Date.now() - time,
         ...index,
+        panels,
         tokens,
         vue,
         data,

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

@@ -1,6 +1,8 @@
-import {
-    getOpt, getMeta, getTemplate, pgClients, getToken,
-} from '../../../../utils.js';
+import getToken from '../../../plugins/crud/funcs/getToken.js';
+import getOpt from '../../../plugins/crud/funcs/getOpt.js';
+import getTemplate from '../../../plugins/table/funcs/getTemplate.js';
+import getMeta from '../../../plugins/pg/funcs/getMeta.js';
+import pgClients from '../../../plugins/pg/pgClients.js';
 
 import getData from '../functions/getData.js';
 

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

@@ -1,6 +1,20 @@
-import {
-  config, getTemplate, getFilterSQL, getMeta, metaFormat, getAccess, setToken, gisIRColumn, applyHook, handlebars, handlebarsSync, getSelect, setOpt, getOpt, pgClients, logger, getFilter,
-} from '../../../../utils.js';
+import config from '../../../../config.js';
+import { handlebars, handlebarsSync } from '../../../helpers/index.js';
+
+import getFilterSQL from '../../../plugins/table/funcs/getFilterSQL/index.js';
+import getAccess from '../../../plugins/crud/funcs/getAccess.js';
+import setToken from '../../../plugins/crud/funcs/setToken.js';
+import gisIRColumn from '../../../plugins/table/funcs/gisIRColumn.js';
+import applyHook from '../../../plugins/hook/funcs/applyHook.js';
+import getSelect from '../../../plugins/table/funcs/getSelect.js';
+import setOpt from '../../../plugins/crud/funcs/setOpt.js';
+import getOpt from '../../../plugins/crud/funcs/getOpt.js';
+import getFilter from '../../../plugins/table/funcs/getFilter.js';
+import logger from '../../../plugins/logger/getLogger.js';
+import getTemplate from '../../../plugins/table/funcs/getTemplate.js';
+import getMeta from '../../../plugins/pg/funcs/getMeta.js';
+import pgClients from '../../../plugins/pg/pgClients.js';
+import metaFormat from '../../../plugins/table/funcs/metaFormat/index.js';
 
 import extraDataGet from '../../../plugins/extra/extraDataGet.js';
 
@@ -17,14 +31,6 @@ const checkInline = {};
 const maxLimit = 100;
 const defaultLimit = 20;
 
-function getOrder(query, columnList, orderColumn, loadTable, orderDir, called) {
-  if (query?.order && called) { return `order by ${query.order}`; }
-  if (typeof orderColumn === 'string' && Array.isArray(columnList) && columnList.includes(orderColumn)) {
-    return `order by ${orderColumn} ${query?.desc || orderDir === 'desc' ? 'desc' : ''} nulls last`;
-  }
-  return `order by ${(loadTable?.order || 'true::boolean')} nulls last`;
-}
-
 export default async function dataAPI(req, reply, called) {
   const {
     pg = pgClients.client, params, headers = {}, query = {}, user = {}, contextQuery, sufix = true,
@@ -174,8 +180,9 @@ export default async function dataAPI(req, reply, called) {
   // id, query, filter
   const [orderColumn, orderDir] = (query.order || loadTable?.order || '').split(/[- ]/);
 
-  const order = getOrder(query, columnList, orderColumn, loadTable, orderDir, called);
-
+  const order = query.order && columnList.includes(orderColumn) && orderColumn?.length
+    ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''} nulls last`
+    : `order by ${(loadTable?.order || 'true::boolean')} nulls last`;
   const search = loadTable?.meta?.search && query.search
     ? `(${loadTable?.meta?.search?.split(',')?.map(el => `${el} ilike '%${query.search.replace(/%/g, '\\%').replace(/'/g, "''")}%'`).join(' or ')})`
     : null;
@@ -269,6 +276,7 @@ export default async function dataAPI(req, reply, called) {
   const { panels = [] } = index;
 
   const tokens = {};
+
   if (template && objectId) {
     // tokens result
     if (!config.security?.disableToken && index?.tokens && typeof index?.tokens === 'object' && !Array.isArray(index?.tokens)) {
@@ -300,19 +308,20 @@ export default async function dataAPI(req, reply, called) {
     });
 
     // title, count
-    panels?.filter(el => el.items).forEach(async el => {
+    await Promise.all(panels.filter(el => el.items).map(async el => {
       const filtered1 = el.items.filter(item => item.count?.toLowerCase?.().includes('select'));
-      const data = await Promise.all(filtered1.map(item => pg.query(item.count.replace(/{{id}}/g, params.id)).then(item1 => item1.rows[0] || {})));
+      const data = await Promise.all(filtered1.map(async item => pg.query(item.count.replace(/{{id}}/g, params.id)).then(item1 => item1.rows[0] || {})));
       filtered1.forEach((el1, i) => {
+        // el1.title = data[i].title;
         Object.assign(el1, data[i] || {}, data[i].count ? {} : { count: undefined });
       });
       const q1 = el.items.map((item) => (item.component ? components[item.component] : null)).filter(item => item).join(' union all ');
       const counts1 = q1 && id
-        ? await pg.query(q, [id])
+        ? await pg.query(q1, [id])
           .then(e => e.rows.reduce((acc, curr) => Object.assign(acc, { [curr.component]: curr.count }), {}))
         : {};
       el.items?.filter?.(item => item.component)?.forEach(item => Object.assign(item, { count: counts1?.[item.component] }));
-    });
+    }));
 
     // data result
     const data = {};

package/utils.js

@@ -101,6 +101,8 @@ import grpc from './server/plugins/grpc/grpc.js';
 import file2json from './server/plugins/grpc/file2json.js';
 import officeConverter from './server/plugins/grpc/office2pdf.js';
 import getExport from './server/plugins/file/getExport.js';
+import jsonToCsv from './server/routes/file/controllers/utils/jsonToCsv.js';
+import jsonToXls from './server/routes/file/controllers/utils/jsonToXls.js';
 
 export default null;
 export {
@@ -196,4 +198,6 @@ export {
   getExport,
   officeConverter,
   allowedExtensions,
+  jsonToCsv,
+  jsonToXls,
 };