@opengis/fastify-table 1.1.39 → 1.1.41

package/Changelog.md

@@ -1,6 +1,6 @@
 # fastify-table
 
-## 1.1.38 - 16.10.2024
+## 1.1.40 - 18.10.2024
 
 - fix migrations
 

package/package.json

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

package/table/controllers/filter.js

@@ -30,11 +30,21 @@ export default async function filter(req) {
     });
     Object.assign(el, { options });
   }));
+
+  const q = ((loadTable?.filterState || []).concat(loadTable?.filterCustom || [])).filter((el) => el.name && el.sql).map((el) => `select count(*), '${el.name}' as name from (${optimizedSQL})q where ${el.sql}`).join(' union all ');
+  const { rows = [] } = q ? await req.pg.query(q) : {};
+  if (rows?.length) {
+    ((loadTable?.filterState || []).concat(loadTable?.filterCustom || [])).filter((el) => el.name && el.sql).forEach((el) => {
+      const { count } = rows.find((row) => row.name === el.name) || {};
+      Object.assign(el, { count, sql: undefined });
+    });
+  }
+
   return {
     time: Date.now() - time,
     list: filters,
-    custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
+    custom: loadTable?.filterCustom,
     inline: loadTable?.filterInline,
-    state: loadTable?.filterState?.map(el => ({ label: el.label })),
+    state: loadTable?.filterState,
   };
 }

package/table/controllers/table.js

@@ -5,19 +5,20 @@ import { applyHook } from '../../utils.js';
 
 export default async function tableAPI(req) {
   const {
-    pg, params = {}, query = {}, opt = {},
+    pg, params = {}, query = {},
   } = req;
   if (!params.id) return { message: 'not enough params', status: 400 };
 
-  const loadTable = await getTemplate('table', opt?.table || params.table) || {};
-  if (!loadTable) {
-    if (!pg.pk?.[opt?.table || params.table]) { return { message: 'not found', status: 404 }; }
-  }
-
   const check = await applyHook('preTable', { req });
   if (check?.message && check?.status) {
     return { message: check?.message, status: check?.status };
   }
+  const { opt = {} } = req;
+
+  const loadTable = await getTemplate('table', opt?.table || params.table) || {};
+  if (!loadTable) {
+    if (!pg.pk?.[opt?.table || params.table]) { return { message: 'not found', status: 404 }; }
+  }
 
   const {
     table, /* columns, */ form,

package/test/api/user.test.js

@@ -64,9 +64,10 @@ test('applyHook to API data/table', async (t) => {
       url: `${prefix}/user-cls/${body.name}`,
       body,
     });
+    const resp = res.json();
     assert.equal(res.statusCode, 200);
-    assert.equal(res.json().status || 200, 200);
-    assert.equal(res.json().message?.children?.length, 1);
+    assert.equal(resp.status || 200, 200);
+    assert.equal(resp.message?.children?.length, 1);
   });
 
   await t.test('clean up', async () => {

package/user/controllers/user.cls.js

@@ -11,6 +11,10 @@ export default async function userCls(req) {
     return { message: 'access restricted', status: 403 };
   }
 
+  if (query.type && !['json', 'sql'].includes(query.type)) {
+    return { message: 'param type is invalid', status: 400 };
+  }
+
   const q = `select user_clsid as id, name, type, 
   case when type='json' then (
       ${params?.id
@@ -28,7 +32,7 @@ export default async function userCls(req) {
       case when type='sql' then data else null end as sql from admin.user_cls u
     where (case when type='json' then parent is null else true end)
     and uid=(select uid from admin.users where $1 in (login,uid) limit 1)
-    and parent is null and ${params?.id ? 'u.name=$2' : '1=1'}`;
+    and parent is null and ${query.type ? `type='${query.type}'` : '1=1'} and ${params?.id ? 'u.name=$2' : '1=1'}`;
 
   if (query?.sql) return q;
 
@@ -40,8 +44,8 @@ export default async function userCls(req) {
       if (row.type === 'json') { delete row.sql; Object.assign(row, { children: row.children || (params?.id ? [] : 0) }); }
     });
 
-    const clsList = getTemplatePath('cls');
-    const selectList = getTemplatePath('select');
+    const clsList = query.type === 'sql' ? [] : getTemplatePath('cls'); // skip cls if type sql
+    const selectList = query.type === 'json' ? [] : getTemplatePath('select'); // skip sql if type json
 
     const userClsNames = rows.map((el) => el.name);
     const selectNames = selectList.map((el) => el[0]);

package/utils.js

@@ -21,7 +21,7 @@ import dataDelete from './crud/funcs/dataDelete.js';
 import getToken from './crud/funcs/getToken.js';
 import setToken from './crud/funcs/setToken.js';
 import checkXSS from './crud/controllers/utils/checkXSS.js';
-import gisIRColumn from './table/controllers/utils/gisIRColumn.js';
+import getTableColumn from './table/controllers/utils/gisIRColumn.js';
 import getMeta from './pg/funcs/getMeta.js';
 import getAccess from './crud/funcs/getAccess.js';
 import getSelectVal from './table/funcs/metaFormat/getSelectVal.js';
@@ -32,38 +32,69 @@ import addHook from './hook/funcs/addHook.js';
 import execMigrations from './migration/exec.migrations.js';
 import addNotification from './notification/funcs/addNotification.js';
 import sendNotification from './notification/funcs/sendNotification.js';
+import getFilterSQL from './table/funcs/getFilterSQL/index.js';
+
+import addCron from './cron/funcs/addCron.js';
+import getOpt from './crud/funcs/getOpt.js';
+import setOpt from './crud/funcs/setOpt.js';
+
+import isFileExists from './crud/funcs/isFileExists.js';
+
 import logger from './logger/getLogger.js';
 // const logger = false; // test!
 
 export default null;
 export {
+
+  addCron,
+  execMigrations,
+  getRedis,
   logger,
+  isFileExists,
+
+  // hook
+  addHook,
+  applyHook,
+
+  // template
   getTemplate,
   getTemplatePath,
-  userTemplateDir,
-  metaFormat,
-  autoIndex,
   addTemplateDir,
-  getPG,
-  getPGAsync,
-  initPG,
-  pgClients,
+  userTemplateDir,
+
+  // notification
+  addNotification,
+  sendNotification,
+
+  // security
+  checkXSS,
+  getAccess,
+  getToken,
+  getOpt,
+  setOpt,
+  setToken,
+
+  // crud
   dataInsert,
   dataUpdate,
   dataDelete,
-  getRedis,
-  getToken,
-  setToken,
-  checkXSS,
-  gisIRColumn,
+
+  // table
+  autoIndex,
+  metaFormat,
+  getFilterSQL,
   getMeta,
-  getAccess,
+  getTableColumn,
+
+  // pg
+  initPG,
+  getPG,
+  getPGAsync,
+  pgClients,
+
+  // select
   getSelectVal,
   getSelectMeta,
   getSelect,
-  applyHook,
-  addHook,
-  execMigrations,
-  addNotification,
-  sendNotification,
+
 };