@opengis/fastify-table 1.2.24 → 1.2.25

package/package.json

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

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

@@ -1,5 +1,5 @@
 import {
-  config, getTemplate, getFilterSQL, getMeta, metaFormat, getAccess, setToken, gisIRColumn, applyHook, handlebars, handlebarsSync, getSelect, setOpt,
+  config, getTemplate, getFilterSQL, getMeta, metaFormat, getAccess, setToken, gisIRColumn, applyHook, handlebars, handlebarsSync, getSelect, setOpt, getOpt,
 } from '../../../../utils.js';
 
 import conditions from './utils/conditions.js';
@@ -26,11 +26,13 @@ export default async function dataAPI(req) {
     return { message: hookData?.message, status: hookData?.status };
   }
 
-  const loadTable = await getTemplate('table', hookData?.table || params.table);
-  if (!loadTable) { return { message: 'template not found', status: 404 }; }
+  const tokenData = await getOpt(params.table, user?.uid);
 
-  const id = hookData?.id || params?.id;
-  const { actions = [], query: accessQuery } = await getAccess({ table: hookData?.table || params.table, id, user }) || {};
+  const loadTable = await getTemplate('table', tokenData?.table || hookData?.table || params.table);
+  if (!loadTable && !(tokenData?.table && pg.pk?.[tokenData?.table])) { return { message: 'template not found', status: 404 }; }
+
+  const id = tokenData?.id || hookData?.id || params?.id;
+  const { actions = [], query: accessQuery } = await getAccess({ table: tokenData?.table || hookData?.table || params.table, id, user }) || {};
 
   if (!actions.includes('view') && !config?.local) {
     return { message: 'access restricted', status: 403 };
@@ -38,12 +40,12 @@ export default async function dataAPI(req) {
 
   const {
     table, columns = [], sql, cardSql, filters, form, meta, sqlColumns, public: ispublic,
-  } = loadTable;
+  } = loadTable || tokenData;
 
   const tableMeta = await getMeta(table);
   if (tableMeta?.view) {
-    if (!loadTable?.key) return { message: `key not found: ${table}`, status: 404 };
-    Object.assign(tableMeta, { pk: loadTable?.key });
+    if (!loadTable?.key && !tokenData?.key) return { message: `key not found: ${table}`, status: 404 };
+    Object.assign(tableMeta, { pk: loadTable?.key || tokenData?.key });
   }
   const { pk, columns: dbColumns = [] } = tableMeta || {};
 
@@ -84,26 +86,26 @@ export default async function dataAPI(req) {
     json: 1,
   }) : {};
 
-  const keyQuery = query.key && loadTable.key && !(hookData?.id || params.id) ? `${loadTable.key}=$1` : null;
+  const keyQuery = query.key && (loadTable?.key || tokenData?.key) && !(hookData?.id || tokenData?.id || params.id) ? `${loadTable?.key || tokenData?.key}=$1` : null;
 
   const limit = Math.min(maxLimit, +(query.limit || 20));
 
   const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
   // id, query, filter
-  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
+  const [orderColumn, orderDir] = (query.order || loadTable?.order || '').split(/[- ]/);
 
   const order = query.order && columnList.includes(orderColumn) && orderColumn?.length
     ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}`
-    : `order by ${(loadTable.order || 'true')}`;
-  const search = loadTable.meta?.search && query.search
-    ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search.replace(/%/g, '\\%').replace(/'/g, "''")}%'`).join(' or ')})`
+    : `order by ${(loadTable?.order || 'true')}`;
+  const search = loadTable?.meta?.search && query.search
+    ? `(${loadTable?.meta?.search?.split(',')?.map(el => `${el} ilike '%${query.search.replace(/%/g, '\\%').replace(/'/g, "''")}%'`).join(' or ')})`
     : null;
   const queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
   const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
   const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
 
   const interfaceQuery = params?.query ? await handlebars.compile(params?.query)({ user, uid }) : undefined;
-  const where = [(hookData?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, search, accessQuery || '1=1', bbox, queryPolyline, interfaceQuery].filter((el) => el).filter((el) => (user?.user_type === 'superadmin' ? !el.includes('{{uid}}') : true));
+  const where = [(tokenData?.id || hookData?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable?.query, tokenData?.query, fData.q, search, accessQuery || '1=1', bbox, queryPolyline, interfaceQuery].filter((el) => el).filter((el) => (user?.user_type === 'superadmin' ? !el.includes('{{uid}}') : true));
 
   // const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
   const q = `select  ${pk ? `"${pk}" as id,` : ''} 
@@ -122,9 +124,9 @@ export default async function dataAPI(req) {
 
   if (query.sql === '1') { return q; }
 
-  const { rows } = await pg.query(q, (hookData?.id || params.id ? [hookData?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
+  const { rows } = await pg.query(q, (tokenData?.id || hookData?.id || params.id ? [tokenData?.id || hookData?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
 
-  const filterWhere = [fData.q, search, bbox, queryPolyline, interfaceQuery, loadTable.query].filter((el) => el);
+  const filterWhere = [fData.q, search, bbox, queryPolyline, interfaceQuery, loadTable?.query, tokenData?.query].filter((el) => el);
 
   const aggColumns = columns.filter((el) => el.agg).reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.agg }), {});
   const aggregates = dbColumns.map((el) => ({ name: el.name, type: pg.pgType[el.dataTypeID] })).filter((el) => ['numeric', 'double precision'].includes(el.type) && aggColumns[el.name]);
@@ -133,22 +135,22 @@ export default async function dataAPI(req) {
             count(*) FILTER(WHERE ${filterWhere.join(' and ') || 'true'})::int as filtered
             ${aggregates.length ? `,${aggregates.map((el) => `${aggColumns[el.name]}(${el.name}) FILTER(WHERE ${filterWhere.join(' and ') || 'true'}) as ${el.name}`).join(',')}` : ''}
             from ${table} t ${sqlTable} 
-            where ${[loadTable.query, accessQuery].filter(el => el).join(' and ') || 'true'} `
+            where ${[loadTable?.query, tokenData?.query, accessQuery].filter(el => el).join(' and ') || 'true'} `
     .replace(/{{uid}}/g, uid);
 
   if (query.sql === '2') { return qCount; }
 
-  const counts = keyQuery || hookData?.id || params.id
+  const counts = keyQuery || tokenData?.id || hookData?.id || params.id
     ? { total: rows.length, filtered: rows.length }
-    : await pg.queryCache(qCount, { table: loadTable.table, time: 5 }).then(el => el?.rows[0] || {});
+    : await pg.queryCache(qCount, { table: loadTable?.table || tokenData?.table, time: 5 }).then(el => el?.rows[0] || {});
 
   const { total, filtered } = counts;
   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 });
+  await metaFormat({ rows, table: tokenData?.table || hookData?.table || params.table });
 
   const status = [];
-  if (loadTable.meta?.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) || {};
@@ -159,16 +161,16 @@ export default async function dataAPI(req) {
       ?.forEach(el => status.push({ ...el, count: rows.filter(row => el.id === row[statusColumn.name]).length }));
   }
 
-  const template = await getTemplate('card', hookData?.table || params.table);
+  const template = await getTemplate('card', tokenData?.table || hookData?.table || params.table);
   const index = template?.find(el => el[0] === 'index.yml')?.[1] || {};
 
   const html = {};
   const { panels = [] } = index;
 
-  if (template && (hookData?.id || params.id)) {
+  const tokens = {};
+  if (template && (tokenData?.id || hookData?.id || params.id)) {
 
     // tokens result
-    const tokens = {};
     if (index?.tokens && typeof index?.tokens === 'object' && !Array.isArray(index?.tokens)) {
       Object.keys(index.tokens || {})
         .filter(key => index?.tokens[key]?.public
@@ -235,7 +237,8 @@ export default async function dataAPI(req) {
   const res = {
     time: Date.now() - time,
     public: ispublic,
-    card: loadTable.card,
+    tokens,
+    card: loadTable?.card,
     actions,
     total,
     filtered,
@@ -255,7 +258,7 @@ export default async function dataAPI(req) {
   // console.log({ add: loadTable.table, form: loadTable.form });
   if (uid && actions.includes('add')) {
     const addTokens = setToken({
-      ids: [JSON.stringify({ table: hookData?.table || params.table, form: loadTable.form })],
+      ids: [JSON.stringify({ table: tokenData?.table || hookData?.table || params.table, form: loadTable?.form })],
       uid,
       array: 1,
     });
@@ -263,7 +266,7 @@ export default async function dataAPI(req) {
   }
 
   const result = await applyHook('afterData', {
-    table: loadTable.table, payload: res, user,
+    table: loadTable?.table || tokenData?.table, payload: res, user,
   });
 
   return result || res;