@opengis/admin 0.1.58 → 0.1.60

package/server/plugins/hook.js

@@ -1,228 +1,152 @@
-import fp from 'fastify-plugin';
-import fs from 'node:fs';
-import path from 'node:path';
-
-import { addHook, getTemplatePath, getTemplate, pgClients } from '@opengis/fastify-table/utils.js';
-
-import getMenu from '../routes/menu/controllers/getMenu.js';
-
-import config from '../../config.js';
-
-// to export the decorators to the outer scope
-
-async function plugin(fastify) {
-  fastify.decorate('config', config);
-
-  addHook('afterTemplate', async ({ req, data = {} }) => {
-    const { uid } = req.session.passport?.user || {};
-    if (!uid || !data || req.params?.type !== 'form' || !req.params?.name) return null;
-    const { pg, params = {} } = req;
-    const { rows: properties = [] } = await pg.query(`select name, title, format, data from admin.custom_column 
-      where entity=$1 and uid=$2`, [params.name?.replace('.form', '.table'), uid]);
-    await Promise.all(properties.map(async (el) => {
-      const clsData = el.data ? await getTemplate(['cls', 'select'], el.data) : undefined;
-      const type = clsData ? 'Select' : ({ date: 'DatePicker' }[el.format] || 'Text');
-      Object.assign(data?.schema || data || {}, { [el.name]: { type, ua: el.title, data: el.data, options: type === 'Select' && Array.isArray(clsData) && clsData?.length ? clsData : undefined, extra: 1 } });
-    }));
-  });
-
-  addHook('afterUpdate', async ({ req, res = {} }) => {
-    const {
-      pg, session = {}, params = {}, body = {},
-    } = req;
-    const { uid } = session.passport?.user || {};
-    if (!uid) return null;
-
-    const loadTable = await getTemplate('table', params.table);
-    if (!pg.pk[loadTable?.table || params.table]) return null;
-    const pk = pg.pk[loadTable?.table || params.table];
-    const id = res[pk];
-
-    const { rows: properties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column 
-    where entity=$1 and uid=$2`, [params.table, uid]);
-
-    if (!id || !properties?.length) return null;
-
-    const q = `delete from crm.extra_data where property_entity='${params.table}' and object_id='${id}';${properties
-      .filter((el) => Object.keys(body).includes(el.name))
-      .map((el) => `insert into crm.extra_data(property_id,property_key,property_entity,object_id,${el.format?.toLowerCase() === 'date' ? 'value_date' : 'value_text'})
-        select '${el.column_id}', '${el.name}', '${params.table}', '${id}', ${el.format?.toLowerCase() === 'date' ? `'${body[el.name]}'::timestamp without time zone` : `'${body[el.name]}'::text`}`)
-      .join(';\n') || ''}`;
-    return pg.query(q);
-  });
-
-  addHook('afterInsert', async ({ req, res = {} }) => {
-    const {
-      pg, session = {}, params = {}, body = {},
-    } = req;
-    const { uid } = session.passport?.user || {};
-    if (!uid) return null;
-
-    const loadTable = await getTemplate('table', params.table);
-    if (!pg.pk[loadTable?.table || params.table]) return null;
-    const pk = pg.pk[loadTable?.table || params.table];
-    const id = res.rows?.[0]?.[pk];
-
-    const { rows: properties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column 
-    where entity=$1 and uid=$2`, [params.table, uid]);
-
-    if (!id || !properties?.length) return null;
-
-    const q = properties
-      .filter((el) => Object.keys(body).includes(el.name))
-      .map((el) => `insert into crm.extra_data(property_id,property_key,property_entity,object_id,${el.format?.toLowerCase() === 'date' ? 'value_date' : 'value_text'})
-        select '${el.column_id}', '${el.name}', '${params.table}', '${id}', ${el.format?.toLowerCase() === 'date' ? `'${body[el.name]}'::timestamp without time zone` : `'${body[el.name]}'::text`}`)
-      .join(';\n');
-    return pg.query(q);
-  });
-
-  fastify.addHook('onListen', async () => {
-    const { client } = pgClients;
-    const json = await getMenu();
-    // insert interface list to db (user access management)
-    if (client?.pk?.['admin.routes'] && json?.length) {
-      const menuList = json.filter((el) => el?.menu?.length && el?.ua || el?.en || el?.name);
-      const interfaces = menuList.reduce((acc, curr) => { curr.menu.forEach((el) => acc.push(el.path)); return acc; }, []);
-      await client.query('update admin.routes set enabled=false where not array[route_id] <@ $1::text[]', [interfaces]);
-
-      const q = `insert into admin.menu(name, ord) values${menuList.map((el, i) => `('${(el?.ua || el?.en || el?.name).replace(/'/g, '’')}', ${i}) `).join(',')
-        } on conflict (name) do update set ord=excluded.ord, enabled=true returning name, menu_id`;
-      const { rows = [] } = await client.query(q);
-      await client.query('update admin.menu set enabled=false where not array[menu_id] <@ $1::text[]', [rows.map((el) => el.menu_id)]);
-
-      const menus = rows.reduce((acc, curr) => Object.assign(acc, { [curr.menu_id]: menuList.find((item) => (item?.ua || item?.en || item?.name) === curr.name) }), {});
-      const values = Object.entries(menus).reduce((acc, curr) => { curr[1]?.menu?.forEach((el) => acc.push({ ...el, menuId: curr[0] })); return acc; }, []);
-
-      await Promise.all(values.filter((el) => el?.table).map(async (el) => Object.assign(el, { table: (await getTemplate('table', el.table))?.table || el.table })));
-
-      const q1 = `insert into admin.routes(route_id, alias, title, menu_id, table_name) values ${values.map((el) => `('${el.path}', '${el.path}', '${el.title}', '${el.menuId}', '${el.table}')`).join(',')} 
-      on conflict (route_id) do update set menu_id=excluded.menu_id, title=excluded.title, enabled=true,
-      table_name=excluded.table_name returning route_id, table_name`;
-      try {
-        const { rowCount } = await client.query(q1);
-        // console.log('interface insert ok', values, rowCount);
-      } catch (err) {
-        console.log('interface insert error', values, q1, err);
-      }
-    }
-  });
-
-  fastify.addHook('onListen', async () => {
-    const { client: pg } = pgClients;
-    const clsQuery = [];
-    if (!pg.pk?.['admin.cls']) return;
-
-    const selectList = await getTemplatePath('select');
-    const clsList = (await getTemplatePath('cls'))?.filter((el) => !(selectList?.map((el) => el?.[0]) || []).includes(el[0]));
-    const cls = (selectList || []).concat(clsList || [])
-      ?.map((el) => ({ name: el[0], module: path.basename(path.dirname(path.dirname(el[1]))), type: { 'json': 'cls', 'sql': 'select' }[el[2]] }))
-    if (!cls?.length) return;
-
-    const dupes = cls.filter((el, idx, arr) => arr.map((item) => item.name).indexOf(el.name) !== idx);
-    // console.log('cls insert skip dupes', dupes.map((el) => el.name));
-
-    try {
-      await Promise.all(cls.filter((el, idx, arr) => arr.map((item) => item.name).indexOf(el.name) === idx).map(async (el) => {
-        const { name, module, type } = el;
-        const loadTemplate = await getTemplate(type, name);
-        //console.log(name, type);
-        if (type === 'select') {
-          clsQuery.push(`insert into admin.cls(name,type,data,module) values('${name}','sql','${(loadTemplate?.sql || loadTemplate)?.replace(/'/g, "''")}', '${module?.replace(/'/g, "''")}')`);
-        } else if (type === 'cls' && loadTemplate?.length) {
-          clsQuery.push(`insert into admin.cls(name,type, module) values('${name}','json', '${module?.replace(/'/g, "''")}'); 
-            insert into admin.cls(code,name,parent,icon) 
-            select value->>'id',value->>'text','${name}',value->>'icon' 
-            from json_array_elements('${JSON.stringify(loadTemplate).replace(/'/g, "''")}'::json)`);
-        } else {
-          console.log(name, type, 'empty');
-        }
-      }));
-
-      await pg.query('truncate admin.cls');
-      if (clsQuery.filter((el) => el).length) {
-        await pg.query(clsQuery.filter((el) => el).join(';'));
-        console.log('cls insert ok', clsQuery?.length);
-      }
-    } catch (err) {
-      console.error('cls insert error', err.toString());
-    }
-  });
-
-  // pre Request
-  fastify.addHook('onRequest', async (req) => {
-    req.funcs = fastify;
-    const { user } = req.session?.passport || {};
-    req.user = user;
-  });
-
-  // preSerialization
-  fastify.addHook('preSerialization', async (req, reply, payload) => {
-    if (req.url.includes('/suggest/') && !req.query.json) {
-      return payload?.data;
-    }
-    if (payload?.redirect) {
-      return reply.redirect(payload.redirect);
-    }
-    if (reply.sent) {
-      return null;
-    }
-
-    if (['200', '400', '500', '403', '404'].includes(payload?.status)) {
-      reply.status(payload.status);
-    }
-    /* if (payload.headers) {
-      reply.headers(payload.headers);
-    } */
-    if (payload?.buffer) {
-      return payload.buffer;
-    }
-    if (payload?.file) {
-      // const buffer = await readFile(payload.file);
-      // return reply.send(buffer);
-      const stream = fs.createReadStream(payload.file);
-      return stream;
-      // return reply.send(stream);
-    }
-
-    if (payload?.message) {
-      return payload.message;
-    }
-    return payload;
-  });
-
-  //  preValidation
-  fastify.addHook('preValidation', async (req) => {
-    const parseRawBody = ['POST', 'PUT'].includes(req.method) && req.body && typeof req.body === 'string'
-      && req.body.trim(/\r\n/g).startsWith('{')
-      && req.body.trim(/\r\n/g).endsWith('}');
-    if (parseRawBody) {
-      try {
-        req.body = JSON.parse(req.body || '{}');
-      }
-      catch (err) {
-        // throw new Error('invalid body');
-        // return { error: 'invalid body', status: 400 };
-      }
-    }
-  });
-
-  // allow upload file
-  const kIsMultipart = Symbol.for('[FastifyMultipart.isMultipart]');
-  fastify.addContentTypeParser('multipart', (request, _, done) => {
-    request[kIsMultipart] = true;
-    done(null);
-  });
-
-  // parse Body
-  function contentParser(req, body, done) {
-    const parseBody = decodeURIComponent(body.toString()).split('&').reduce((acc, el) => {
-      const [key, val] = el.split('=');
-      return { ...acc, [key]: val };
-    }, {});
-    done(null, parseBody);
-  }
-
-  fastify.addContentTypeParser('application/x-www-form-urlencoded', { parseAs: 'buffer' }, contentParser);
-}
-
-export default fp(plugin);
+import { addHook, getToken, setToken, getTemplate } from '@opengis/fastify-table/utils.js';
+
+export default async function plugin(fastify) {
+
+    addHook('preTable', async ({ req }) => {
+        if (!req?.routeOptions?.method) return;
+        const mode = { POST: 'a', DELETE: 'w', PUT: 'w', GET: 'w' }[req.routeOptions.method] || 'w';
+        const { funcs, params = {}, session = {} } = req;
+        const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : (session?.passport?.user || {});
+        const opt = await getToken({
+            uid, token: params.id || params.form || params.table, mode, json: 1,
+        });
+        if (opt) Object.assign(req, { opt });
+        if (!opt && !funcs?.config?.local) {
+            return { message: 'access restricted: edit', status: 403 };
+        }
+        return null;
+    });
+
+    addHook('afterTable', async ({ req = {}, res = {}, rows = [], table }) => {
+        const { pg, funcs, params = {}, session = {} } = req;
+        const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : (session?.passport?.user || {});
+        if (!uid || !table || !pg?.pk?.[table] || !rows.length || !params.table) return;
+
+        // admin.custom_column - user column data
+        const { rows: properties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column 
+    where _table and entity=$1 and uid=$2`, [params.table, uid]);
+        const extraColumnList = properties.map((row) => ({ id: row.column_id, name: row.name, title: row.title, format: row.format, data: row.data }));
+        if (!extraColumnList?.length) return;
+
+        if (res?.columns?.length) {
+            extraColumnList.forEach((col) => res.columns.push(col));
+        }
+
+        const { rows: extraData = [] } = await pg.query(`select object_id, json_object_agg( property_id, coalesce(value_date::text,value_text) ) as extra from crm.extra_data 
+    where property_entity=$1 and property_id=any($2) and object_id=any($3) group by object_id`, [params.table, extraColumnList?.map((el) => el.id), rows.map((el) => el.id)]);
+
+        if (!extraData?.length) {
+            // Object.assign(rows?.[0] || {}, { ...extraColumnList.reduce((acc, curr) => Object.assign(acc, { [curr.name]: null }), {}) });
+            return;
+        }
+
+        rows.filter((row) => extraData.map((el) => el?.object_id).includes(row.id)).forEach((row) => {
+            const { extra = {} } = extraData.find((el) => el.object_id === row.id);
+            Object.assign(row, { ...Object.fromEntries(Object.entries(extra).map((el) => [extraColumnList.find((col) => col.id === el[0]).name, el[1]])) });
+        });
+
+        // admin.custom_column - metaFormat
+        await Promise.all(extraColumnList.filter((el) => el?.data).map(async (attr) => {
+            const values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => el);
+            if (!values.length) return;
+            const cls = await getSelectVal({ name: attr.data, values });
+            if (!cls) return;
+            rows.forEach(el => {
+                const val = el[attr.name]?.map?.(c => cls[c] || c) || cls[el[attr.name]] || el[attr.name];
+                if (!val) return;
+                Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
+            });
+        }));
+    });
+
+    // extract table from form token for user columns - p.2 - read (refactor to global token)
+    /* addHook('preTemplate', async ({ req = {} }) => {
+        const { funcs, params = {}, session = {} } = req;
+        const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : (session?.passport?.user || {});
+        if (!uid || params?.type !== 'form' || !params?.name) return null;
+
+        const { table, form } = await getToken({
+            uid, token: params.name, mode: 'w', json: 1,
+        }) || {};
+        if (form) {
+            Object.assign(req.params || {}, { name: form, table });
+        }
+    }); */
+
+    addHook('afterTemplate', async ({ req = {}, data = {} }) => {
+        const { funcs, session = {} } = req;
+        const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : (session?.passport?.user || {});
+        const { pg, params = {} } = req;
+        // extract table from form token for user columns - p.1 - assign (refactor to global token)
+        /* if (params?.type === 'table') {
+            const { form } = await getTemplate('table', params.name) || {};
+            if (!form) return;
+            const editTokens = setToken({
+                ids: [{ table: params.name, form }],
+                mode: 'w',
+                uid,
+                array: 1,
+            });
+            Object.assign(data, { token: editTokens[0] });
+        } */
+        if (!uid || !data || params?.type !== 'form' || !params?.name) return null;
+
+        const { rows: properties = [] } = await pg.query(`select name, title, format, data from admin.custom_column 
+        where entity=$1 and uid=$2`, [params.table || params.name, uid]);
+        await Promise.all(properties.map(async (el) => {
+            const clsData = el.data ? await getTemplate(['cls', 'select'], el.data) : undefined;
+            const type = clsData ? 'Select' : ({ date: 'DatePicker' }[el.format] || 'Text');
+            Object.assign(data?.schema || data || {}, { [el.name]: { type, ua: el.title, data: el.data, options: type === 'Select' && Array.isArray(clsData) && clsData?.length ? clsData : undefined, extra: 1 } });
+        }));
+    });
+
+    addHook('afterUpdate', async ({ req, res = {} }) => {
+        const {
+            pg, funcs, session = {}, params = {}, body = {},
+        } = req;
+        const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : (session?.passport?.user || {});
+        if (!uid) return null;
+
+        const loadTable = await getTemplate('table', params.table);
+        if (!pg.pk[loadTable?.table || params.table]) return null;
+        const pk = pg.pk[loadTable?.table || params.table];
+        const id = res[pk];
+
+        const { rows: properties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column 
+        where entity=$1 and uid=$2`, [params.table, uid]);
+
+        if (!id || !properties?.length) return null;
+
+        const q = `delete from crm.extra_data where property_entity='${params.table}' and object_id='${id}';${properties
+            .filter((el) => Object.keys(body).includes(el.name))
+            .map((el) => `insert into crm.extra_data(property_id,property_key,property_entity,object_id,${el.format?.toLowerCase() === 'date' ? 'value_date' : 'value_text'})
+        select '${el.column_id}', '${el.name}', '${params.table}', '${id}', ${el.format?.toLowerCase() === 'date' ? `'${body[el.name]}'::timestamp without time zone` : `'${body[el.name]}'::text`}`)
+            .join(';\n') || ''}`;
+        return pg.query(q);
+    });
+
+    addHook('afterInsert', async ({ req, res = {} }) => {
+        const {
+            pg, funcs, session = {}, params = {}, body = {},
+        } = req;
+        const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : (session?.passport?.user || {});
+        if (!uid) return null;
+
+        const loadTable = await getTemplate('table', params.table);
+        if (!pg.pk[loadTable?.table || params.table]) return null;
+        const pk = pg.pk[loadTable?.table || params.table];
+        const id = res.rows?.[0]?.[pk];
+
+        const { rows: properties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column 
+    where entity=$1 and uid=$2`, [params.table, uid]);
+
+        if (!id || !properties?.length) return null;
+
+        const q = properties
+            .filter((el) => Object.keys(body).includes(el.name))
+            .map((el) => `insert into crm.extra_data(property_id,property_key,property_entity,object_id,${el.format?.toLowerCase() === 'date' ? 'value_date' : 'value_text'})
+        select '${el.column_id}', '${el.name}', '${params.table}', '${id}', ${el.format?.toLowerCase() === 'date' ? `'${body[el.name]}'::timestamp without time zone` : `'${body[el.name]}'::text`}`)
+            .join(';\n');
+        return pg.query(q);
+    });
+}

package/server/plugins/vite.js

@@ -1,69 +1,69 @@
-import fs from 'fs';
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
-
-const dir = dirname(fileURLToPath(import.meta.url));
-const root = `${dir}/../..`;
-
-const isProduction = process.env.NODE_ENV === 'production';
-
-async function plugin(fastify) {
-  // vite server
-  if (!isProduction) {
-    const vite = await import('vite');
-
-    const viteServer = await vite.createServer({
-      server: {
-        middlewareMode: true,
-      },
-    });
-    // hot reload
-    viteServer.watcher.on('all', function (d, t) {
-      if (!t.includes('module')) return;
-      console.log(d, t);
-      viteServer.ws.send({ type: 'full-reload' });
-    });
-
-    // this is middleware for vite's dev servert
-    fastify.addHook('onRequest', async (req, reply) => {
-      const { user } = req.session?.passport || {};
-      const { disableAuth } = req.funcs?.config || {};
-      if (!user && !disableAuth) {
-        // return reply.send('access restricted');
-      }
-
-      const next = () => new Promise((resolve) => {
-        viteServer.middlewares(req.raw, reply.raw, () => resolve());
-      });
-      await next();
-    });
-    fastify.get('*', async () => { });
-    return;
-  }
-
-  // From Build
-  fastify.get('*', async (req, reply) => {
-    const { user } = req.session?.passport || {};
-
-    // if (!user) return reply.redirect('/login');
-    const stream = fs.createReadStream('dist/index.html');
-    return reply.type('text/html').send(stream);
-  });
-
-  async function staticFile(req, reply) {
-    const assetsDir = 'dist';
-    const filePath = path.join(root, assetsDir, req.url);
-    const ext = path.extname(filePath);
-    const mime = {
-      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg',
-    }[ext];
-    reply.headers({ 'Cache-control': 'max-age=3600, public' });
-    const stream = fs.createReadStream(filePath);
-    return mime ? reply.type(mime).send(stream) : stream;
-  }
-
-  fastify.get('/assets/*', staticFile);
-  fastify.get('/public/*', staticFile);
-}
-
-export default plugin;
+import fs from 'fs';
+import path, { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const dir = dirname(fileURLToPath(import.meta.url));
+const root = `${dir}/../..`;
+
+const isProduction = process.env.NODE_ENV === 'production';
+
+async function plugin(fastify) {
+  // vite server
+  if (!isProduction) {
+    const vite = await import('vite');
+
+    const viteServer = await vite.createServer({
+      server: {
+        middlewareMode: true,
+      },
+    });
+    // hot reload
+    viteServer.watcher.on('all', function (d, t) {
+      if (!t.includes('module')) return;
+      console.log(d, t);
+      viteServer.ws.send({ type: 'full-reload' });
+    });
+
+    // this is middleware for vite's dev servert
+    fastify.addHook('onRequest', async (req, reply) => {
+      const { user } = req.session?.passport || {};
+      const { disableAuth } = req.funcs?.config || {};
+      if (!user && !disableAuth) {
+        // return reply.send('access restricted');
+      }
+
+      const next = () => new Promise((resolve) => {
+        viteServer.middlewares(req.raw, reply.raw, () => resolve());
+      });
+      await next();
+    });
+    fastify.get('*', async () => { });
+    return;
+  }
+
+  // From Build
+  fastify.get('*', async (req, reply) => {
+    const { user } = req.session?.passport || {};
+
+    if (!user) return reply.redirect('/login');
+    const stream = fs.createReadStream('dist/index.html');
+    return reply.type('text/html').send(stream);
+  });
+
+  async function staticFile(req, reply) {
+    const assetsDir = 'dist';
+    const filePath = path.join(root, assetsDir, req.url);
+    const ext = path.extname(filePath);
+    const mime = {
+      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg',
+    }[ext];
+    reply.headers({ 'Cache-control': 'max-age=3600, public' });
+    const stream = fs.createReadStream(filePath);
+    return mime ? reply.type(mime).send(stream) : stream;
+  }
+
+  fastify.get('/assets/*', staticFile);
+  fastify.get('/public/*', staticFile);
+}
+
+export default plugin;