@opengis/fastify-table 1.2.0 → 1.2.2

package/package.json

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

package/server/plugins/crud/funcs/dataDelete.js

@@ -11,9 +11,10 @@ export default async function dataDelete({
 }) {
   const pg = pg1 || getPG({ name: 'client' });
   const { pk } = await getMeta({ pg, table });
-  if (!pg.tlist?.includes(table)) return 'table not exist';
+  const table1 = table.replace(/"/g, '');
+  if (!pg.tlist?.includes(table1)) return 'table not exist';
   const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
-  //  console.log(updateDataset);
+
   const res = await pg.query(delQuery, [id]).then(el => el.rows?.[0] || {});
   await logChanges({
     pg, table, tokenData, referer, id, uid, type: 'DELETE',

package/server/plugins/crud/funcs/dataInsert.js

@@ -36,8 +36,16 @@ export default async function dataInsert({
 
   const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
 
+  const table1 = pg.pk[table] ? table : table.replace(/"/g, '');
   await logChanges({
-    pg, table, tokenData, referer, data, id: res.rows?.[0]?.[pg.pk[table]], uid, type: 'INSERT',
+    pg,
+    table,
+    tokenData,
+    referer,
+    data,
+    id: res.rows?.[0]?.[pg.pk[table1]],
+    uid,
+    type: 'INSERT',
   });
 
   rclient.incr(`pg:${table}:crud`);

package/server/plugins/crud/funcs/getAccess.js

@@ -56,12 +56,17 @@ export default async function getAccess({ table, user = {} }) {
     return { actions: [], query: '1=1' };
   }
 
-  const userAccess = await pgClients.client.query(q, [table, uid])
-    .then(el => ({
-      ...el.rows[0] || {},
-      roles: el.rows?.map?.(row => row.role_id) || [],
-      actions: el.rows?.map?.(row => row.actions).flat() || [],
-    }));
+  const userAccess = pgClients.client?.pk?.['admin.routes']
+    && pgClients.client?.pk?.['admin.role_access']
+    && pgClients.client?.pk?.['admin.roles']
+    && pgClients.client?.pk?.['admin.user_roles']
+    ? await pgClients.client.query(q, [table, uid])
+      .then(el => ({
+        ...el.rows[0] || {},
+        roles: el.rows?.map?.(row => row.role_id) || [],
+        actions: el.rows?.map?.(row => row.actions).flat() || [],
+      }))
+    : {};
 
   const query = userAccess?.scope === 'my' ? `uid='${uid}'` : '1=1';
   const actions = userAccess?.actions?.filter?.((el, idx, arr) => arr.indexOf(el) === idx && tableActions.includes(el));

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

@@ -11,8 +11,9 @@ function getValue(val) {
 // extract titles and cls from form schema
 // alt: extract table template from referer -> form
 export default async function logChanges({
-  pg, table, tokenData, referer, id, data, uid = 1, type,
+  pg, table: table1, tokenData, referer, id, data, uid = 1, type,
 }) {
+  const table = table1.replace(/"/g, '');
   if (!id) {
     console.error('param id is required');
     return null;

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

@@ -1,6 +1,5 @@
 import {
-  config, getTemplate, getFilterSQL, getMeta, metaFormat, getAccess, setToken, gisIRColumn, applyHook,
-  handlebars,
+  config, getTemplate, getFilterSQL, getMeta, metaFormat, getAccess, setToken, gisIRColumn, applyHook, handlebars, getSelect,
 } from '../../../../utils.js';
 
 const maxLimit = 100;
@@ -135,8 +134,21 @@ export default async function dataAPI(req) {
   const agg = Object.keys(counts).filter(el => !['total', 'filtered'].includes(el)).reduce((acc, el) => ({ ...acc, [el]: counts[el] }), {});
 
   await metaFormat({ rows, table: hookData?.table || params.table });
+
+  const status = [];
+  if (loadTable.meta?.status) {
+    const statusColumn = loadTable.meta?.cls?.[loadTable.meta?.status]
+      ? { name: loadTable.meta?.status, data: loadTable.meta?.cls?.[loadTable.meta?.status] }
+      : loadTable.columns.find(col => col.name === loadTable.meta?.status) || {};
+
+    const statusCls = statusColumn.data || statusColumn.option;
+    const statusClsData = statusCls ? await getSelect(statusCls, pg) : {};
+    statusClsData?.arr
+      ?.forEach(el => status.push({ ...el, count: rows.filter(row => el.id === row[statusColumn.name]).length }));
+  }
+
   const res = {
-    time: Date.now() - time, public: ispublic, card: loadTable.card, actions, total, filtered, count: rows.length, pk, form, agg, rows, meta, columns, filters,
+    time: Date.now() - time, public: ispublic, card: loadTable.card, actions, total, filtered, count: rows.length, pk, form, agg, status, rows, meta, columns, filters,
   };
 
   // console.log({ add: loadTable.table, form: loadTable.form });