@opengis/fastify-table 1.4.82 → 1.4.84

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

@@ -1,82 +1,82 @@
-import getSelect from './getSelect.js';
-
-import getFilterSQL from './getFilterSQL/index.js';
-import getTemplate from './getTemplate.js';
-import pgClients from '../../pg/pgClients.js';
-import config from '../../../../config.js';
-import getSelectVal from './metaFormat/getSelectVal.js';
-
-export default async function gisIRColumn({
-  pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
-}) {
-  const time = Date.now();
-
-  const sel = await getSelect(query.cls || column, pg);
-
-  const body = await getTemplate('table', layer);
-  const fData = await getFilterSQL({
-    table: layer,
-    filter,
-    state,
-    search,
-    custom,
-  });
-
-  const { tlist } = await pg.one(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
-  where relkind in ('r','v','m')`);
-
-  const tableName = body?.table || layer;
-  if (!tlist.includes(tableName)) return { error: `table not found: ${tableName}`, status: 400 };
-
-  // eslint-disable-next-line max-len
-  const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${tableName}`})q limit 0`);
-
-  const col = fields.find((el) => el.name === column);
-
-  if (!col) return { status: 404, message: 'not found' };
-  const colField = pg.pgType[col.dataTypeID]?.includes('[]') ? `unnest(${column})` : column;
-
-  const q = `select ${colField} as id, count(*)::int from (
-    ${fData?.optimizedSQL || `select * from ${tableName} where ${body?.query || 'true'}`}
-  )t group by ${colField} order by count desc limit 15`;
-
-  if (sql) return q;
-
-  if (!body?.columns?.length) {
-    const { rows } = await pg.query(q);
-    if (sel?.arr?.length) {
-      rows.forEach((el) => {
-        const data = sel?.find((item) => item.id?.toString() === el.id?.toString());
-        Object.assign(el, data || {});
-      });
-    }
-    return {
-      count: rows?.reduce((acc, el) => acc + el.count, 0),
-      sql: config.local ? q : undefined,
-      rows,
-    };
-  }
-
-  const { rows } = await pg.query(q);
-  const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
-  const select = await getSelectVal({
-    pg, name: cls, values: rows.map((el) => el.id), ar: 1,
-  });
-  rows.forEach((el) => {
-    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,
-    count: rows.reduce((acc, el) => acc + el.count, 0),
-    sql: config.local ? q : undefined,
-    rows,
-  };
-}
+import getSelect from './getSelect.js';
+
+import getFilterSQL from './getFilterSQL/index.js';
+import getTemplate from './getTemplate.js';
+import pgClients from '../../pg/pgClients.js';
+import config from '../../../../config.js';
+import getSelectVal from './metaFormat/getSelectVal.js';
+
+export default async function gisIRColumn({
+  pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
+}) {
+  const time = Date.now();
+
+  const sel = await getSelect(query.cls || column, pg);
+
+  const body = await getTemplate('table', layer);
+  const fData = await getFilterSQL({
+    table: layer,
+    filter,
+    state,
+    search,
+    custom,
+  });
+
+  const { tlist } = await pg.one(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
+  where relkind in ('r','v','m')`);
+
+  const tableName = body?.table || layer;
+  if (!tlist.includes(tableName)) return { error: `table not found: ${tableName}`, status: 400 };
+
+  // eslint-disable-next-line max-len
+  const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${tableName}`})q limit 0`);
+
+  const col = fields.find((el) => el.name === column);
+
+  if (!col) return { status: 404, message: 'not found' };
+  const colField = pg.pgType[col.dataTypeID]?.includes('[]') ? `unnest(${column})` : column;
+
+  const q = `select ${colField} as id, count(*)::int from (
+    ${fData?.optimizedSQL || `select * from ${tableName} where ${body?.query || 'true'}`}
+  )t group by ${colField} order by count desc limit 15`;
+
+  if (sql) return q;
+
+  if (!body?.columns?.length) {
+    const { rows } = await pg.query(q);
+    if (sel?.arr?.length) {
+      rows.forEach((el) => {
+        const data = sel?.find((item) => item.id?.toString() === el.id?.toString());
+        Object.assign(el, data || {});
+      });
+    }
+    return {
+      count: rows?.reduce((acc, el) => acc + el.count, 0),
+      sql: config.local ? q : undefined,
+      rows,
+    };
+  }
+
+  const { rows } = await pg.query(q);
+  const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
+  const select = await getSelectVal({
+    pg, name: cls, values: rows.map((el) => el.id), ar: 1,
+  });
+  rows.forEach((el) => {
+    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,
+    count: rows.reduce((acc, el) => acc + el.count, 0),
+    sql: config.local ? q : undefined,
+    rows,
+  };
+}

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

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

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

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

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

@@ -1 +1 @@
-export default [];
+export default [];

package/server/plugins/util/funcs/unflattenObject.js

@@ -10,6 +10,7 @@ export default function unflattenObject(flatObj) {
             if (index === keys.length - 1) {
                 // json array
                 if (typeof flatObj[key] === 'string' && flatObj[key].startsWith('[') && flatObj[key] !== ('[object Object]')) {
+                    // console.log('unflatten aray', key);
                     try {
                         nestedObj[part] = JSON.parse(flatObj[key] || '{}');
                     }
@@ -18,7 +19,8 @@ export default function unflattenObject(flatObj) {
                         nestedObj[part] = flatObj[key]; // fallback to original value if parsing fails
                     }
                 }
-                else if (['true', 'false'].includes(flatObj[key]) || (!isNaN(flatObj[key]) && key !== 'auth.uid')) {
+                else if (['true', 'false'].includes(flatObj[key]) || (!isNaN(flatObj[key])) && false) {
+                    // console.log('unflatten number', key);
                     try {
                         nestedObj[part] = JSON.parse(flatObj[key] || '{}');
                     }
@@ -28,6 +30,7 @@ export default function unflattenObject(flatObj) {
                     }
                 }
                 else {
+                    // console.log('unflatten else', key);
                     nestedObj[part] = flatObj[key];
                 }
             }

package/server/routes/crud/controllers/deleteCrud.js

@@ -18,17 +18,31 @@ export default async function deleteCrud(req, reply) {
   const { referer } = headers;
   const tokenData = await getToken({
     uid: user.uid, token: params.id || params.table, json: 1,
-  }) || await getOpt(params.id || params.table, user.uid);
+  }) || await getOpt(params.id || params.table, user.uid) || await getOpt(params.table, user.uid);
 
-  const { table: del, id } = hookData || tokenData || (config.security?.disableToken || config.local || config.auth?.disable ? req.params : {});
+  const {
+    table: del, id = params.id, query, actions: actionsToken,
+  } = hookData || tokenData || (config.security?.disableToken || config.local || config.auth?.disable ? req.params : {});
+  if (actionsToken && !actionsToken?.include('del')) {
+    return reply.status(403).send({
+      error: 'del is not allowed ',
+      code: 403,
+    });
+  }
   const { actions = [] } = await getAccess({ table: del, id, user }, pg) || {};
 
   if (!tokenData && !config?.local && !config.security?.disableToken && !config.auth?.disable) {
-    return reply.status(400).send('invalid token');
+    return reply.status(403).send({
+      error: 'invalid token',
+      code: 403,
+    });
   }
 
   if (!actions.includes('del') && !config?.local && !tokenData) {
-    return reply.status(403).send('access restricted: actions');
+    return reply.status(403).send({
+      error: 'access restricted: actions',
+      code: 403,
+    });
   }
 
   const loadTemplate = await getTemplate('table', del);
@@ -36,22 +50,34 @@ export default async function deleteCrud(req, reply) {
   const { table } = loadTemplate || hookData || tokenData || req.params || {};
 
   if (!table) {
-    return reply.status(404).send('table is required');
+    return reply.status(404).send({
+      error: 'table is required',
+      code: 404,
+    });
   }
 
   if (!id) {
-    return reply.status(404).send('id is required');
+    return reply.status(404).send({
+      error: 'id is required',
+      code: 404,
+    });
   }
 
   const data = await dataDelete({
-    pg, table, id, uid: user?.uid, tokenData, referer,
+    pg, table, id, uid: user?.uid, tokenData, referer, query,
   }).catch(err => {
     if (err.message?.includes?.('foreign key' || 'unique')) {
       const constraint = err.message.match(/constraint "([^"]+)"/g);
-      return reply.status(400).send(`Видалення заборонено для збереження цілісності БД: ${constraint}`);
+      return reply.status(400).send({
+        error: `Видалення заборонено для збереження цілісності БД: ${constraint}`,
+        code: 400,
+      });
     }
     if (config.trace) console.error(err.toString());
-    return err.toString();
+    return {
+      error: err.toString(),
+      code: 400,
+    };
   });
 
   return reply.status(200).send({ rowCount: data?.rowCount || 0, msg: !data?.rowCount ? data : null });

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

@@ -1,74 +1,74 @@
-import {
-  getMeta, metaFormat, getTemplates, getTemplate, handlebars,
-} from '../../../../utils.js';
-
-function sequence(tables, data, fn) {
-  return tables.reduce((promise, table) => promise.then(() => fn({
-    ...data, tableName: table.replace('.json', ''),
-  })), Promise.resolve());
-}
-
-async function getData({
-  pg, tableName, query = {}, maxLimit, res,
-}) {
-  const loadTable = await getTemplate('table', tableName);
-
-  if (!loadTable) { return { message: 'not found', status: 404 }; }
-
-  const {
-    table, columns, meta,
-  } = loadTable;
-
-  const { pk } = await getMeta(table);
-
-  const cols = columns.map((el) => el.name || el).join(',');
-  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
-  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-
-  const limit = Math.max(maxLimit - res.rows.length, 0);
-  // Math.max(query.offset - res.rows.length,0)
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-
-  const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
-
-  const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
-  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
-  if (query.sql) {
-    res.sql.push(q);
-    return null;
-  }
-
-  const { rows } = await pg.query(q);
-
-  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
-
-  await metaFormat({ rows, table: tableName });
-  res.total += +total;
-  rows.forEach((row) => {
-    const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
-    res.rows.push({
-      ...row, register: tableName, register_title: loadTable.ua, href,
-    });
-  });
-  return null;
-}
-
-export default async function search({
-  pg, funcs, query = {},
-}) {
-  const time = Date.now();
-
-  const tables = query.table ? [query.table] : await getTemplates('table');
-  const res = { rows: [], sql: [], total: 0 };
-
-  const maxLimit = Math.min(100, query.limit || '16');
-  await sequence(tables, {
-    pg, funcs, query, maxLimit, res,
-  }, getData);
-
-  if (query.sql) return res.sql.join(';\n');
-
-  return {
-    time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
-  };
-}
+import {
+  getMeta, metaFormat, getTemplates, getTemplate, handlebars,
+} from '../../../../utils.js';
+
+function sequence(tables, data, fn) {
+  return tables.reduce((promise, table) => promise.then(() => fn({
+    ...data, tableName: table.replace('.json', ''),
+  })), Promise.resolve());
+}
+
+async function getData({
+  pg, tableName, query = {}, maxLimit, res,
+}) {
+  const loadTable = await getTemplate('table', tableName);
+
+  if (!loadTable) { return { message: 'not found', status: 404 }; }
+
+  const {
+    table, columns, meta,
+  } = loadTable;
+
+  const { pk } = await getMeta(table);
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
+  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+
+  const limit = Math.max(maxLimit - res.rows.length, 0);
+  // Math.max(query.offset - res.rows.length,0)
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+
+  const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
+
+  const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
+  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
+  if (query.sql) {
+    res.sql.push(q);
+    return null;
+  }
+
+  const { rows } = await pg.query(q);
+
+  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
+
+  await metaFormat({ rows, table: tableName });
+  res.total += +total;
+  rows.forEach((row) => {
+    const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
+    res.rows.push({
+      ...row, register: tableName, register_title: loadTable.ua, href,
+    });
+  });
+  return null;
+}
+
+export default async function search({
+  pg, funcs, query = {},
+}) {
+  const time = Date.now();
+
+  const tables = query.table ? [query.table] : await getTemplates('table');
+  const res = { rows: [], sql: [], total: 0 };
+
+  const maxLimit = Math.min(100, query.limit || '16');
+  await sequence(tables, {
+    pg, funcs, query, maxLimit, res,
+  }, getData);
+
+  if (query.sql) return res.sql.join(';\n');
+
+  return {
+    time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
+  };
+}

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

@@ -30,7 +30,7 @@ export default async function getTableData(req, reply, called) {
         }
 
         const resp = await getData({
-            pg, params: { id, table: tokenData.table }, headers, query, user, contextQuery: [contextQuery1, tokenData.query].filter(Boolean).join(' and '), sufix, filterList,
+            pg, params: { id, table: tokenData.table }, headers, query, user, contextQuery: [contextQuery1, tokenData.query].filter(Boolean).join(' and '), sufix, filterList, actions: tokenData1?.actions,
         }, reply, called);
         if (resp?.addToken && tokenData.obj) { Object.assign(resp, { addToken: params.table }); }
         return resp;
@@ -52,7 +52,7 @@ export default async function getTableData(req, reply, called) {
     const contextQuery = [contextQuery1, interfaceQuery, context].filter(Boolean).join(' and ') || ' 2=2 ';
 
     const res = await getData({
-        pg, params, query, headers, user, contextQuery, sufix, filterList,
+        pg, params, query, headers, user, contextQuery, sufix, filterList, actions: tokenData1?.actions,
     }, reply, called);
     const route = pg.tlist?.includes('admin.routes') ? await pg.query('select route_id as path, title from admin.routes where enabled and alias=$1 limit 1', [params.table])
         .then(el => el.rows?.[0] || {}) : {};

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

@@ -34,7 +34,7 @@ const defaultLimit = 20;
 
 export default async function dataAPI(req, reply, called) {
   const {
-    pg = pgClients.client, params, headers = {}, query = {}, user = {}, contextQuery, sufix = true, filterList,
+    pg = pgClients.client, params, headers = {}, query = {}, user = {}, contextQuery, sufix = true, filterList, actions: actionsParam,
   } = req;
 
   const time = Date.now();
@@ -52,8 +52,8 @@ export default async function dataAPI(req, reply, called) {
   }
 
   const tokenData = await getOpt(params.table, user?.uid);
-
-  const loadTable = await getTemplate('table', tokenData?.table || hookData?.table || params.table);
+  const templateName = tokenData?.table || hookData?.table || params.table;
+  const loadTable = await getTemplate('table', templateName);
 
   // check sql inline fields count
   if (!checkInline[params?.table] && loadTable?.sql?.length && loadTable.table) {
@@ -227,7 +227,7 @@ export default async function dataAPI(req, reply, called) {
 
   timeArr.push(Date.now());
 
-  if (uid && rows.length && !config.security?.disableToken && (editable || actions.includes('edit') || actions.includes('del'))) {
+  if (uid && rows.length && !config.security?.disableToken && (editable || actionsParam?.includes('edit') || actions.includes('edit') || actions.includes('del'))) {
     rows.forEach(row => {
       Object.assign(row, {
         token: setToken({
@@ -381,8 +381,8 @@ export default async function dataAPI(req, reply, called) {
 
     public: ispublic,
     tokens,
-    card: loadTable?.card,
-    actions,
+    card: !!(loadTable?.card ?? await getTemplate('card', templateName)),
+    actions: actionsParam || actions || ['view'],
     total,
     filtered,
     count: rows.length,