@opengis/fastify-table 1.4.64 → 1.4.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.64",
+  "version": "1.4.66",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -28,7 +28,7 @@
     "compress": "node compress.js",
     "dev1": "set NODE_ENV=dev&& node server.js",
     "dev": "node --env-file=.env.dev --env-file=.env server",
-    "start": "node --env-file=.env.dev server"
+    "start": "node --env-file=.env server"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "3.554.0",

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

@@ -34,7 +34,7 @@ function setToken({
 
   if (!Object.keys(codes).length) return { ids: 'empty' };
 
-  rclient.hmset(`${config.pg.database}:token:edit:${uid}`, codes);
+  rclient.hmset(`${config.pg.database}:token:edit:${uid}`, Object.entries(codes).flat());
   // console.log(`${config.pg.database}:token:edit:${uid}`, idsOrigin, Object.values(obj));
   // TODO дополнительно писать в hset token -> uid
   return array ? Object.values(obj) : obj;

package/server/plugins/pg/index.js

@@ -16,8 +16,8 @@ async function getHeadersPG(req, config) {
     || req.ip.startsWith('192.168.')
     || config.debug
   )
-  && req.headers?.token
-  && config.auth?.tokens?.includes?.(req.headers.token);
+    && req.headers?.token
+    && config.auth?.tokens?.includes?.(req.headers.token);
 
   if (validToken && req.headers?.db) {
     const pg = pgClients[req.headers.db]
@@ -32,7 +32,7 @@ async function plugin(fastify, config) {
 
   fastify.addHook('onRequest', async (req) => {
     const headersPG = await getHeadersPG(req, config);
-    req.pg = headersPG || req.pg || client;
+    req.pg = headersPG || req.pg || client || pgClients.client;
     if (headersPG) {
       req.user = { uid: req.headers?.uid };
       req.folder = config.folder;

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

@@ -1,42 +1,42 @@
-import { applyHook, getTemplate } from '../../../../utils.js';
-
-const sql = `select property_key as key, property_json as json, property_int as int,
-property_text as text from admin.properties where 1=1`;
-
-async function getSettings({ pg }) {
-  const { rows = [] } = await pg.query(sql);
-  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
-  return data;
-}
-
-export default async function formFunction(req) {
-  const time = Date.now();
-
-  const { pg, params, user } = req;
-  const hookData = await applyHook('preForm', { form: params?.form, user });
-
-  if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
-  }
-
-  const form = await getTemplate('form', hookData?.form || params?.form);
-  if (!form) { return { status: 404, message: 'not found' }; }
-
-  // replace settings
-  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
-  if (arr?.length) {
-    const string = JSON.stringify(form);
-    const settings = await getSettings({ pg });
-    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
-    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
-    return { time: Date.now() - time, form: JSON.parse(res) };
-  }
-
-  const res = { time: Date.now() - time, form };
-  const res1 = await applyHook('afterForm', {
-    form: hookData?.form || params?.form,
-    payload: res,
-    user,
-  });
-  return res1 || { time: Date.now() - time, form };
-}
+import { applyHook, getTemplate } from '../../../../utils.js';
+
+const sql = `select property_key as key, property_json as json, property_int as int,
+property_text as text from admin.properties where 1=1`;
+
+async function getSettings({ pg }) {
+  const { rows = [] } = await pg.query(sql);
+  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
+  return data;
+}
+
+export default async function formFunction(req) {
+  const time = Date.now();
+
+  const { pg, params, user } = req;
+  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?.name);
+  if (!form) { return { status: 404, message: 'not found' }; }
+
+  // replace settings
+  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
+  if (arr?.length) {
+    const string = JSON.stringify(form);
+    const settings = await getSettings({ pg });
+    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
+    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
+    return { time: Date.now() - time, form: JSON.parse(res) };
+  }
+
+  const res = { time: Date.now() - time, form };
+  const res1 = await applyHook('afterForm', {
+    form: hookData?.form || params?.name,
+    payload: res,
+    user,
+  });
+  return res1 || { time: Date.now() - time, form };
+}

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

@@ -0,0 +1,96 @@
+import {
+    config, applyHook, getTemplate, pgClients, getAccess, setToken,
+} 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;
+
+    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 res = { schema: loadTemplate?.schema || loadTemplate };
+
+    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/functions/getData.js

@@ -72,7 +72,7 @@ export default async function dataAPI(req, reply, called) {
 
   if (query.sql === '0') return loadTable;
 
-  if (!config.pg) { return reply.status(500).send('empty pg'); }
+  if (!pg) { return reply.status(500).send('empty pg'); }
 
   const pkey = pg.pk?.[params?.table] || pg.pk?.[params?.table.replace(/"/g, '')];
 
@@ -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 }, 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_.-]+)$' },
     },
   },
 };

package/server/routes/widget/controllers/widget.set.js

@@ -1,106 +1,106 @@
-import path from 'node:path';
-
-import getMeta from '../../../plugins/pg/funcs/getMeta.js';
-import dataInsert from '../../../plugins/crud/funcs/dataInsert.js';
-import dataUpdate from '../../../plugins/crud/funcs/dataUpdate.js';
-import applyHook from '../../../plugins/hook/funcs/applyHook.js';
-import uploadMultiPart from '../../../plugins/file/uploadMultiPart.js';
-
-const tableList = {
-  comment: 'crm.communications',
-  gallery: 'crm.files',
-  file: 'crm.files',
-  checklist: 'crm.checklists',
-};
-const pkList = {
-  comment: 'communication_id',
-  checklist: 'checklist_id',
-  file: 'file_id',
-  gallery: 'file_id',
-};
-
-const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
-
-export default async function widgetSet(req, reply) {
-  const {
-    pg, params = {}, session = {}, headers = {}, body = {}, user = {},
-  } = req;
-  const { type, id, objectid } = params;
-
-  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) {
-    return reply.status(400).send('param type not valid');
-  }
-
-  if (!objectid) {
-    return reply.status(400).send('not enough params: id');
-  }
-
-  const table = tableList[type];
-
-  // dsadasdad
-  if (['gallery', 'file'].includes(type) && headers['content-type']?.split?.(';')?.shift?.() === 'multipart/form-data') {
-    const file = await uploadMultiPart(req);
-    const extName = path.extname(file.filepath).slice(1).toLowerCase();
-
-    const data = {
-      uploaded_name: file?.originalFilename?.toLocaleLowerCase()?.replace(/'/g, '\'\''),
-      file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
-      ext: extName,
-      size: file?.size,
-      file_status: 1,
-      uid: user?.uid || 1,
-      entity_id: objectid,
-    };
-
-    if (type === 'gallery' && !galleryExtList.includes(extName.toLowerCase())) {
-      return reply.status(400).send('invalid file extension');
-    }
-
-    const { rows = [] } = await dataInsert({
-      pg, table: 'crm.files', data, uid: user?.uid,
-    });
-
-    if (type === 'gallery') {
-      await pg.query(`update crm.files set ismain=true 
-      where entity_id=$1 
-      and file_id=$2 
-      and (select count(*) = 0 from crm.files where entity_id=$1 and ismain)`, [objectid, rows[0]?.file_id]);
-    }
-
-    return {
-      rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
-    };
-  }
-  const { pk } = await getMeta({ pg, table });
-
-  if (!pk) {
-    return reply.status(404).send('table not found');
-  }
-
-  const data = { ...body, uid: user?.uid, entity_id: objectid };
-
-  await applyHook('onWidgetSet', {
-    pg,
-    link: req.path,
-    id,
-    objectid,
-    user,
-    type,
-    payload: data,
-  });
-
-  const result = id
-    ? await dataUpdate({
-      pg, table, data, id, uid: user?.uid,
-    })
-    : await dataInsert({
-      pg, table, data, uid: user?.uid,
-    });
-
-  return reply.status(200).send({
-    rowCount: result.rowCount,
-    data: 'ok',
-    command: result.command,
-    id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
-  });
-}
+import path from 'node:path';
+
+import getMeta from '../../../plugins/pg/funcs/getMeta.js';
+import dataInsert from '../../../plugins/crud/funcs/dataInsert.js';
+import dataUpdate from '../../../plugins/crud/funcs/dataUpdate.js';
+import applyHook from '../../../plugins/hook/funcs/applyHook.js';
+import uploadMultiPart from '../../../plugins/file/uploadMultiPart.js';
+
+const tableList = {
+  comment: 'crm.communications',
+  gallery: 'crm.files',
+  file: 'crm.files',
+  checklist: 'crm.checklists',
+};
+const pkList = {
+  comment: 'communication_id',
+  checklist: 'checklist_id',
+  file: 'file_id',
+  gallery: 'file_id',
+};
+
+const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
+
+export default async function widgetSet(req, reply) {
+  const {
+    pg, params = {}, session = {}, headers = {}, body = {}, user = {},
+  } = req;
+  const { type, id, objectid } = params;
+
+  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) {
+    return reply.status(400).send('param type not valid');
+  }
+
+  if (!objectid) {
+    return reply.status(400).send('not enough params: id');
+  }
+
+  const table = tableList[type];
+
+  // dsadasdad
+  if (['gallery', 'file'].includes(type) && headers['content-type']?.split?.(';')?.shift?.() === 'multipart/form-data') {
+    const file = await uploadMultiPart(req);
+    const extName = path.extname(file.filepath).slice(1).toLowerCase();
+
+    const data = {
+      uploaded_name: file?.originalFilename?.toLocaleLowerCase()?.replace(/'/g, '\'\''),
+      file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
+      ext: extName,
+      size: file?.size,
+      file_status: 1,
+      uid: user?.uid || 1,
+      entity_id: objectid,
+    };
+
+    if (type === 'gallery' && !galleryExtList.includes(extName.toLowerCase())) {
+      return reply.status(400).send('invalid file extension');
+    }
+
+    const { rows = [] } = await dataInsert({
+      pg, table: 'crm.files', data, uid: user?.uid,
+    });
+
+    if (type === 'gallery') {
+      await pg.query(`update crm.files set ismain=true 
+      where entity_id=$1 
+      and file_id=$2 
+      and (select count(*) = 0 from crm.files where entity_id=$1 and ismain)`, [objectid, rows[0]?.file_id]);
+    }
+
+    return {
+      rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
+    };
+  }
+  const { pk } = await getMeta({ pg, table });
+
+  if (!pk) {
+    return reply.status(404).send('table not found');
+  }
+
+  const data = { ...body, uid: user?.uid, entity_id: objectid };
+
+  await applyHook('onWidgetSet', {
+    pg,
+    link: req.path,
+    id,
+    objectid,
+    user,
+    type,
+    payload: data,
+  });
+
+  const result = id
+    ? await dataUpdate({
+      pg, table, data, id, uid: user?.uid,
+    })
+    : await dataInsert({
+      pg, table, data, uid: user?.uid,
+    });
+
+  return reply.status(200).send({
+    rowCount: result.rowCount,
+    data: 'ok',
+    command: result.command,
+    id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
+  });
+}