@opengis/fastify-table 1.4.65 → 1.4.67

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/routes/crud/controllers/table.js

@@ -4,7 +4,7 @@ import {
 
 import extraDataGet from '../../../plugins/extra/extraDataGet.js';
 
-export default async function tableAPI(req, reply) {
+export default async function tableAPI(req, reply, called) {
   const {
     pg = pgClients.client, params, user = {}, query = {},
   } = req;
@@ -15,14 +15,14 @@ export default async function tableAPI(req, reply) {
   });
 
   if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
+    return reply.status(hookData?.status).send(hookData?.message);
   }
   const templateName = hookData?.table || tokenData.table || params.table;
 
   const loadTable = await getTemplate('table', templateName);
 
   if (!loadTable && !pg.pk?.[tokenData.table]) {
-    return { message: 'not found', status: 404 };
+    return reply.status(404).send('not found');
   }
 
   const { table = params.table, /* columns, */ form } = hookData || loadTable || tokenData;
@@ -30,6 +30,7 @@ export default async function tableAPI(req, reply) {
   const id = hookData?.id || tokenData.id || params.id;
 
   if (tokenData && !id) return { message: {} };
+
   if (!table && !id) {
     return reply.status(400).send('not enough params');
   }
@@ -38,11 +39,11 @@ export default async function tableAPI(req, reply) {
     table, form, id, user,
   }, pg) || {};
 
-  if (!tokenData && !config?.local && !config.security?.disableToken) {
+  if (!tokenData && !config?.local && !config.security?.disableToken && !called) {
     return reply.status(400).send('invalid token');
   }
 
-  if (!actions.includes('edit') && !config?.local && !tokenData) {
+  if (!actions.includes('edit') && !config?.local && !tokenData && !called) {
     return reply.status(403).send('access restricted: actions');
   }
 
@@ -97,7 +98,7 @@ export default async function tableAPI(req, reply) {
       Object.assign(data, { [key]: extraRows });
     }));
   }
-  if (user?.uid && !config.security?.disableToken && actions.includes('edit')) {
+  if (user?.uid && !config.security?.disableToken && actions.includes('edit') && !called) {
     data.token = tokenData?.table ? params.table : setToken({
       ids: [JSON.stringify({ id, table, form })],
       uid: user.uid,

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

@@ -13,13 +13,13 @@ export default async function formFunction(req) {
   const time = Date.now();
 
   const { pg, params, user } = req;
-  const hookData = await applyHook('preForm', { form: params?.form, user });
+  const hookData = await applyHook('preForm', { form: params?.name, user });
 
   if (hookData?.message && hookData?.status) {
     return { message: hookData?.message, status: hookData?.status };
   }
 
-  const form = await getTemplate('form', hookData?.form || params?.form);
+  const form = await getTemplate('form', hookData?.form || params?.name);
   if (!form) { return { status: 404, message: 'not found' }; }
 
   // replace settings
@@ -34,7 +34,7 @@ export default async function formFunction(req) {
 
   const res = { time: Date.now() - time, form };
   const res1 = await applyHook('afterForm', {
-    form: hookData?.form || params?.form,
+    form: hookData?.form || params?.name,
     payload: res,
     user,
   });

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

@@ -0,0 +1,110 @@
+import {
+    config, applyHook, getTemplate, pgClients, getAccess, setToken, getSelectMeta,
+} from '../../../../utils.js';
+
+import getEditData from '../../crud/controllers/table.js';
+
+const q = `select
+    property_key as key,
+    property_json as json,
+    property_int as int,
+    property_text as text
+from admin.properties
+where 1=1`;
+
+export default async function getForm({
+    pg = pgClients.client, params = {}, user = {}, query = {},
+}, reply) {
+    const time = Date.now();
+    const { add, edit } = query;
+
+    if (!user?.uid) {
+        return reply.status(401).send('unauthorized');
+    }
+
+    const hookData = await applyHook('preForm', { table: params.name, user });
+
+    if (hookData?.message && hookData?.status) {
+        return reply.status(hookData?.status).send(hookData?.message);
+    }
+
+    const { form } = await getTemplate('table', hookData?.table || params.name) || {};
+
+    if (!form) {
+        return reply.status(404).send('form not found');
+    }
+
+    const { actions = [] } = await getAccess({ table: hookData?.table || params.name, form, user }, pg) || {};
+
+    const loadTemplate = form ? await getTemplate('form', form) : null;
+
+    if (!loadTemplate) {
+        return reply.status(404).send('form template not found');
+    }
+
+    const { schema = loadTemplate } = loadTemplate;
+
+    await Promise.all(Object.keys(schema || {}).filter(key => schema[key]?.data).map(async key => {
+        const { arr } = await getSelectMeta({ name: schema[key].data, pg }) || {};
+        if (arr) {
+            schema[key].data = undefined;
+            schema[key].options = arr;
+        }
+    }));
+
+    const res = { schema };
+
+    if (add && user.uid) {
+        if (!actions.includes('add') && !config.local) {
+            return reply.status(403).send('access restricted: actions');
+        }
+        const addTokens = setToken({
+            ids: [
+                JSON.stringify({
+                    table: hookData?.table || params.name,
+                    form,
+                })],
+            uid: user.uid,
+            array: 1,
+        });
+        Object.assign(res, { token: addTokens[0] });
+    }
+
+    if (edit && user.uid) {
+        if (!actions.includes('edit') && !config.local) {
+            return reply.status(403).send('access restricted: actions');
+        }
+        const editTokens = setToken({
+            ids: [JSON.stringify({ id: edit, table: hookData?.table || params.name, form })],
+            uid: user.uid,
+            array: 1,
+        });
+        const data = await getEditData({
+            pg, params: { table: hookData?.table || params.name, id: edit }, user,
+        }, reply, true);
+        Object.assign(res, { token: editTokens[0], data });
+    }
+
+    // replace settings
+    const arr = JSON.stringify(loadTemplate).match(/{{settings.([^}]*)}}/g);
+
+    if (arr?.length) {
+        const string = JSON.stringify(loadTemplate);
+        const { rows = [] } = await pg.query(q);
+        const settings = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
+        const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
+        const result = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
+        Object.assign(res, { time: Date.now() - time, schema: JSON.parse(result) });
+        return res;
+    }
+
+    Object.assign(res, { time: Date.now() - time });
+
+    const res1 = await applyHook('afterForm', {
+        table: hookData?.table || params.name,
+        payload: res,
+        user,
+    });
+
+    return reply.status(200).send(res1 || res);
+}

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/functions/getData.js

@@ -108,7 +108,9 @@ export default async function dataAPI(req, reply, called) {
     logger.file('crud/warning', { msg: 'invalid filters', template: tokenData?.table || hookData?.table || params.table });
   }
 
-  const { list: filters = [] } = await getFilter({
+  const objectId = tokenData?.id || hookData?.id || params.id;
+
+  const { list: filters = [] } = objectId ? {} : await getFilter({
     pg, table: tokenData?.table || hookData?.table || params.table, user,
   }) || {};
 
@@ -156,7 +158,6 @@ export default async function dataAPI(req, reply, called) {
     });
   }
 
-  const objectId = tokenData?.id || hookData?.id || params.id;
   const isdefault = !objectId ? filters.find(el => el.default) : null;
 
   const checkFilter = [query.filter, query.search, query.state, query.custom, isdefault].filter((el) => el).length;
@@ -353,6 +354,7 @@ export default async function dataAPI(req, reply, called) {
         });
         const name = el[0].substring(0, el[0].lastIndexOf('.'));
         html[name] = htmlContent;
+        panels?.forEach?.(panel => panel?.items?.filter?.(item => item.name === name)?.forEach?.(el1 => Object.assign(el1, { html: htmlContent })));
       }
       catch (err) {
         const name = el[0].substring(0, el[0].lastIndexOf('.'));
@@ -398,7 +400,7 @@ export default async function dataAPI(req, reply, called) {
   }
 
   // console.log({ add: loadTable.table, form: loadTable.form });
-  if (uid && !config.security?.disableToken && actions.includes('add')) {
+  if (uid && !config.security?.disableToken && actions.includes('add') && !objectId) {
     const addTokens = setToken({
       ids: [
         JSON.stringify({

package/server/routes/table/index.js

@@ -9,7 +9,8 @@ import tokenInfo from './controllers/tokenInfo.js';
 import card from './controllers/card.js';
 import search from './controllers/search.js';
 import filter from './controllers/filter.js';
-import form from './controllers/form.js';
+// import form from './controllers/form.js';
+import form from './controllers/getFormByTable.js';
 
 import loadTemplatePath from '../../plugins/table/funcs/loadTemplatePath.js';
 
@@ -48,7 +49,7 @@ async function plugin(app, config = {}) {
 
   app.get(`${prefix}/templates`, () => loadTemplatePath);
   app.get(`${prefix}/filter/:table`, { config: { policy }, schema: filterSchema }, filter);
-  app.get(`${prefix}/form/:form`, { config: { policy }, schema: formSchema }, form);
+  app.get(`${prefix}/form/:name`, { config: { policy: ['user', 'site'] }, schema: formSchema }, form);
 }
 
 export default plugin;

package/server/routes/table/schema.js

@@ -85,7 +85,7 @@ const formSchema = {
   type: 'object',
   properties: {
     params: {
-      form: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+      name: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
     },
   },
 };