@opengis/admin 0.3.22 → 0.3.24

package/server/plugins/vite.js

@@ -1,77 +1,77 @@
-import fs from 'fs';
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
-
-const dir = dirname(fileURLToPath(import.meta.url));
-const root = `${dir}/../..`;
-import { config } from '@opengis/fastify-table/utils.js';
-
-const isProduction = process.env.NODE_ENV === 'production' || config.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 || {};
-
-      if (!user && req.url.startsWith('/login')) {
-        return reply.redirect(`/login?redirect=${req.url}`);
-      }
-
-      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 && req.url.startsWith('/login')) {
-      return reply.redirect(`/login?redirect=${req.url}`);
-    }
-    const stream = fs.createReadStream('dist/index.html');
-    return reply.type('text/html').send(stream);
-  });
-
-  const fileSize = {}
-  async function staticFile(req, reply) {
-    const assetsDir = 'dist';
-    const filePath = path.join(root, assetsDir, req.url);
-    const ext = path.extname(filePath);
-
-    if (!fs.existsSync(filePath)) return { status: 404, message: 'not found' }
-    fileSize[filePath] = fileSize[filePath] || fs.statSync(filePath).size;
-    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', 'Content-length': fileSize[filePath], 'Content-Encoding': 'identity' });
-
-    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}/../..`;
+import { config } from '@opengis/fastify-table/utils.js';
+
+const isProduction = process.env.NODE_ENV === 'production' || config.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 || {};
+
+      if (!user && req.url.startsWith('/login')) {
+        return reply.redirect(`/login?redirect=${req.url}`);
+      }
+
+      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 && req.url.startsWith('/login')) {
+      return reply.redirect(`/login?redirect=${req.url}`);
+    }
+    const stream = fs.createReadStream('dist/index.html');
+    return reply.type('text/html').send(stream);
+  });
+
+  const fileSize = {}
+  async function staticFile(req, reply) {
+    const assetsDir = 'dist';
+    const filePath = path.join(root, assetsDir, req.url);
+    const ext = path.extname(filePath);
+
+    if (!fs.existsSync(filePath)) return { status: 404, message: 'not found' }
+    fileSize[filePath] = fileSize[filePath] || fs.statSync(filePath).size;
+    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', 'Content-length': fileSize[filePath], 'Content-Encoding': 'identity' });
+
+    const stream = fs.createReadStream(filePath);
+    return mime ? reply.type(mime).send(stream) : stream;
+  }
+
+  fastify.get('/assets/*', staticFile);
+  fastify.get('/public/*', staticFile);
+}
+
+export default plugin;

package/server/routes/access/controllers/access.interface.js

@@ -1,34 +1,34 @@
-import { pgClients, metaFormat } from '@opengis/fastify-table/utils.js';
-import { getAdminAccess } from '../../../../utils.js';
-
-const q = `select a.route_id as id, coalesce(b.user_uid, d.user_uid) as user_uid, coalesce(d.actions, b.actions, array['view']) as actions, b.scope, c.role_id
-from admin.routes a 
-left join admin.role_access b on 
-  a.route_id=b.route_id
-left join admin.roles c on 
-  b.role_id=c.role_id 
-  and c.enabled
-left join admin.user_roles d on 
-  c.role_id=d.role_id 
-  and ( case when 
-            d.expiration is not null 
-            then d.expiration > CURRENT_DATE 
-            else 1=1 
-        end )
-where $1 in (a.route_id, a.alias, a.table_name) and coalesce(b.user_uid, d.user_uid) is not null`;
-
-export default async function accessInterface(req) {
-    const { pg = pgClients.client, params = {}, user = {} } = req;
-
-    // restrict access - admin only
-    const check = await getAdminAccess({
-        id: params.name, user,
-    });
-    if (check) return check;
-
-    const { rows = [] } = await pg.query(q, [params.name]);
-
-    const cls = { user_uid: 'core.user_uid', actions: 'core.actions', role_id: 'core.roles' };
-    await metaFormat({ rows, cls, sufix: false });
-    return { rows };
+import { pgClients, metaFormat } from '@opengis/fastify-table/utils.js';
+import { getAdminAccess } from '../../../../utils.js';
+
+const q = `select a.route_id as id, coalesce(b.user_uid, d.user_uid) as user_uid, coalesce(d.actions, b.actions, array['view']) as actions, b.scope, c.role_id
+from admin.routes a 
+left join admin.role_access b on 
+  a.route_id=b.route_id
+left join admin.roles c on 
+  b.role_id=c.role_id 
+  and c.enabled
+left join admin.user_roles d on 
+  c.role_id=d.role_id 
+  and ( case when 
+            d.expiration is not null 
+            then d.expiration > CURRENT_DATE 
+            else 1=1 
+        end )
+where $1 in (a.route_id, a.alias, a.table_name) and coalesce(b.user_uid, d.user_uid) is not null`;
+
+export default async function accessInterface(req) {
+    const { pg = pgClients.client, params = {}, user = {} } = req;
+
+    // restrict access - admin only
+    const check = await getAdminAccess({
+        id: params.name, user,
+    });
+    if (check) return check;
+
+    const { rows = [] } = await pg.query(q, [params.name]);
+
+    const cls = { user_uid: 'core.user_uid', actions: 'core.actions', role_id: 'core.roles' };
+    await metaFormat({ rows, cls, sufix: false });
+    return { rows };
 }

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

@@ -1,128 +1,128 @@
-import path from 'node:path';
-
-import { getAccess, handlebars, setOpt, setToken, getTemplate, handlebarsSync, applyHook } from "@opengis/fastify-table/utils.js";
-//import { setOpt, setToken } from "../../../../../fastify-table/utils.js";
-// import yaml from 'js-yaml';
-import getTableData from "./tableData.js";
-import conditions from './utils/conditions.js';
-
-const components = {
-    'vs-widget-file': `select 'vs-widget-file' as component, count(*) from crm.files where entity_id=$1 and file_status<>3`,
-    'vs-widget-comments': `select 'vs-widget-comments' as component, count(*) from crm.communications where entity_id=$1`
-};
-
-export default async function getCardData(req) {
-
-    const {
-        pg, params = {}, session = {}, user
-    } = req;
-    const { table, id } = params;
-    const uid = session.passport?.user?.uid;
-
-    const res = await applyHook('cardData', { table, id, user });
-    if (res) return res;
-
-
-    const time = Date.now();
-
-    const template = await getTemplate('card', table);
-    const access = await getAccess({ table, user });
-
-    const tableTemplate = await getTemplate('table', table);
-
-    const index = template?.find(el => el[0] === 'index.yml')?.[1] || {};
-
-    const { message, rows = [] } = index.table && index.query ? await pg.query(`select * from ${index.table} where ${handlebarsSync.compile(index.query)({ uid, user })}`) :
-        await getTableData({ pg, params: { table, id }, session, user });
-
-    if (message) return { message };
-
-    // conditions 
-    index.panels?.filter(el => el.items).forEach(el => {
-        el.items = el.items?.filter(el => conditions(el.conditions, rows[0]));
-    })
-
-    // title, count
-    index.panels?.filter(el => el.items).forEach(async el => {
-        const filtered = el.items.filter(el => el.count?.toLowerCase?.().includes('select'));
-        const data = await Promise.all(filtered.map(el => pg.query(el.count).then(el => el.rows[0] || {})))
-        filtered.forEach((el, i) => {
-            Object.assign(el, data[i] || {}, data[i].count ? {} : { count: undefined })
-        });
-        const q = el.items.map((el) => el.component ? components[el.component] : null).filter(el => el).join(' union all ');
-        const counts = q && id
-            ? await pg.query(q, [id])
-                .then(e => e.rows.reduce((acc, curr) => Object.assign(acc, { [curr.component]: curr.count }), {}))
-            : {};
-        el.items?.filter?.(item => item.component)?.forEach(item => Object.assign(item, { count: counts?.[item.component] }));
-    })
-
-
-    // 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
-                || access.actions?.includes?.('edit')
-                || access.actions?.includes?.('add')
-                || !index?.tokens[key]?.table
-            )
-            .forEach(key => {
-                const item = index?.tokens[key];
-                Object.keys(item).filter(el => item[el]?.includes?.('{{')).forEach(el => {
-                    item[el] = handlebarsSync.compile(item[el])({ user, uid: user?.uid, id, data: rows[0] });
-                });
-
-                const token = item.form && item.table ? setToken({
-                    ids: [JSON.stringify(item)],
-                    uid,
-                    array: 1,
-                })[0] : setOpt(item, user.uid);
-                tokens[key] = token;
-            });
-    }
-
-    // vue result
-    const vue = template?.filter((el) => el[0].endsWith('.vue'))
-        .reduce((acc, curr) => Object.assign(acc, { [path.parse(curr[0]).name]: curr[1].match(/<template[^>]*>([\s\S]*?)<\/template>/)[1].trim() }), {});
-
-    // data result
-    const data = {};
-    const route = await pg.query(`select route_id as path, title from admin.routes where enabled and alias=$1 limit 1`, [table])
-        .then(el => el.rows?.[0] || {});
-    Object.assign(route, { tableTitle: tableTemplate?.title });
-    if (index?.data && index?.data?.[0]?.name) {
-        await Promise.all(index.data.filter((el) => el?.name && el?.sql).map(async (el) => {
-            const q = handlebarsSync.compile(el.sql)({ data: rows[0], user, uid: user?.uid, id });
-            const { rows: sqlData } = await pg.query(q);
-            data[el.name] = sqlData;
-        }));
-    }
-
-
-
-    // html result
-    const html = {};
-    if (template) {
-        await Promise.all(template.filter(el => el[0].includes('.hbs')).map(async (el) => {
-            const htmlContent = await handlebars.compile(el[1])({ ...rows[0], user, data, tokens });
-            const name = el[0].substring(0, el[0].lastIndexOf('.'))
-            html[name] = htmlContent;
-        }));
-    }
-
-    return {
-        time: Date.now() - time,
-        ...index,
-        tokens,
-        vue,
-        data,
-        route,
-        html,
-        rows,
-        columns: tableTemplate?.columns || tableTemplate?.colModel,
-        table: undefined,
-        query: undefined,
-    };
-
+import path from 'node:path';
+
+import { getAccess, handlebars, setOpt, setToken, getTemplate, handlebarsSync, applyHook } from "@opengis/fastify-table/utils.js";
+//import { setOpt, setToken } from "../../../../../fastify-table/utils.js";
+// import yaml from 'js-yaml';
+import getTableData from "./tableData.js";
+import conditions from './utils/conditions.js';
+
+const components = {
+    'vs-widget-file': `select 'vs-widget-file' as component, count(*) from crm.files where entity_id=$1 and file_status<>3`,
+    'vs-widget-comments': `select 'vs-widget-comments' as component, count(*) from crm.communications where entity_id=$1`
+};
+
+export default async function getCardData(req) {
+
+    const {
+        pg, params = {}, session = {}, user
+    } = req;
+    const { table, id } = params;
+    const uid = session.passport?.user?.uid;
+
+    const res = await applyHook('cardData', { table, id, user });
+    if (res) return res;
+
+
+    const time = Date.now();
+
+    const template = await getTemplate('card', table);
+    const access = await getAccess({ table, user });
+
+    const tableTemplate = await getTemplate('table', table);
+
+    const index = template?.find(el => el[0] === 'index.yml')?.[1] || {};
+
+    const { message, rows = [] } = index.table && index.query ? await pg.query(`select * from ${index.table} where ${handlebarsSync.compile(index.query)({ uid, user })}`) :
+        await getTableData({ pg, params: { table, id }, session, user });
+
+    if (message) return { message };
+
+    // conditions 
+    index.panels?.filter(el => el.items).forEach(el => {
+        el.items = el.items?.filter(el => conditions(el.conditions, rows[0]));
+    })
+
+    // title, count
+    index.panels?.filter(el => el.items).forEach(async el => {
+        const filtered = el.items.filter(el => el.count?.toLowerCase?.().includes('select'));
+        const data = await Promise.all(filtered.map(el => pg.query(el.count).then(el => el.rows[0] || {})))
+        filtered.forEach((el, i) => {
+            Object.assign(el, data[i] || {}, data[i].count ? {} : { count: undefined })
+        });
+        const q = el.items.map((el) => el.component ? components[el.component] : null).filter(el => el).join(' union all ');
+        const counts = q && id
+            ? await pg.query(q, [id])
+                .then(e => e.rows.reduce((acc, curr) => Object.assign(acc, { [curr.component]: curr.count }), {}))
+            : {};
+        el.items?.filter?.(item => item.component)?.forEach(item => Object.assign(item, { count: counts?.[item.component] }));
+    })
+
+
+    // 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
+                || access.actions?.includes?.('edit')
+                || access.actions?.includes?.('add')
+                || !index?.tokens[key]?.table
+            )
+            .forEach(key => {
+                const item = index?.tokens[key];
+                Object.keys(item).filter(el => item[el]?.includes?.('{{')).forEach(el => {
+                    item[el] = handlebarsSync.compile(item[el])({ user, uid: user?.uid, id, data: rows[0] });
+                });
+
+                const token = item.form && item.table ? setToken({
+                    ids: [JSON.stringify(item)],
+                    uid,
+                    array: 1,
+                })[0] : setOpt(item, user.uid);
+                tokens[key] = token;
+            });
+    }
+
+    // vue result
+    const vue = template?.filter((el) => el[0].endsWith('.vue'))
+        .reduce((acc, curr) => Object.assign(acc, { [path.parse(curr[0]).name]: curr[1].match(/<template[^>]*>([\s\S]*?)<\/template>/)[1].trim() }), {});
+
+    // data result
+    const data = {};
+    const route = await pg.query(`select route_id as path, title from admin.routes where enabled and alias=$1 limit 1`, [table])
+        .then(el => el.rows?.[0] || {});
+    Object.assign(route, { tableTitle: tableTemplate?.title });
+    if (index?.data && index?.data?.[0]?.name) {
+        await Promise.all(index.data.filter((el) => el?.name && el?.sql).map(async (el) => {
+            const q = handlebarsSync.compile(el.sql)({ data: rows[0], user, uid: user?.uid, id });
+            const { rows: sqlData } = await pg.query(q);
+            data[el.name] = sqlData;
+        }));
+    }
+
+
+
+    // html result
+    const html = {};
+    if (template) {
+        await Promise.all(template.filter(el => el[0].includes('.hbs')).map(async (el) => {
+            const htmlContent = await handlebars.compile(el[1])({ ...rows[0], user, data, tokens });
+            const name = el[0].substring(0, el[0].lastIndexOf('.'))
+            html[name] = htmlContent;
+        }));
+    }
+
+    return {
+        time: Date.now() - time,
+        ...index,
+        tokens,
+        vue,
+        data,
+        route,
+        html,
+        rows,
+        columns: tableTemplate?.columns || tableTemplate?.colModel,
+        table: undefined,
+        query: undefined,
+    };
+
 }

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

@@ -1,10 +1,10 @@
-import { getFilter } from "@opengis/fastify-table/utils.js";
-
-export default async function tableFilter(req) {
-    const { pg, params = {}, query = {}, user = {} } = req;
-
-    const { table } = params;
-    const { filter, custom, state, search } = query;
-    const result = await getFilter({ table, pg, filter, custom, state, search, user });
-    return result;
+import { getFilter } from "@opengis/fastify-table/utils.js";
+
+export default async function tableFilter(req) {
+    const { pg, params = {}, query = {}, user = {} } = req;
+
+    const { table } = params;
+    const { filter, custom, state, search } = query;
+    const result = await getFilter({ table, pg, filter, custom, state, search, user });
+    return result;
 }