@opengis/admin 0.2.125 → 0.2.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.2.125",
+  "version": "0.2.127",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",

package/server/plugins/hook.js

@@ -89,14 +89,14 @@ export default async function plugin(fastify) {
             printTemplates[el[0]] = settings;
         });
         if (client?.pk?.['admin.templates']) {
-            const arr = Object.keys(printTemplates || {}).map(el => ({ name: el, ...printTemplates?.[el] || {} }));
+            const arr = Object.keys(printTemplates || {}).map(el => ({ name: el, ...printTemplates?.[el] || {} })).filter(el => el.name && el.route && el.html);
 
             const { rowsCount = 0 } = await pgClients.client.query(`delete from admin.templates where not (name=any($1::text[])) and type = 'demo'`, [arr.map(el => el.name)]);
             console.log('delete deprecated templates', 'ok', rowsCount);
             const { rowsCount: empty = 0 } = await pgClients.client.query('delete from admin.templates where body is null');
             console.log('delete empty templates', 'ok', empty);
 
-            const q = arr.map(el => `insert into admin.templates(name, route_id, title, type, body) values ('${el.name.replace(/'/g, "''")}', '${el.route.replace(/'/g, "''")}', '${el.title.replace(/'/g, "''")}', 'demo', '${(el.html || '').replace(/'/g, "''")}') on conflict(name, type) do update set route_id=excluded.route_id, title=excluded.title`).join(';');
+            const q = arr.map(el => `insert into admin.templates(name, route_id, title, type, body) values ('${el.name.replace(/'/g, "''")}', '${el.route.replace(/'/g, "''")}', '${(el.title || el.name).replace(/'/g, "''")}', 'demo', '${(el.html || '').replace(/'/g, "''")}') on conflict(name, type) do update set route_id=excluded.route_id, title=excluded.title`).join(';');
             const res = await pgClients.client.query(q);
             console.log('insert print templates', 'ok', (Array.isArray(res) ? res : [res]).length);
         }

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

@@ -65,6 +65,7 @@ export default async function getCardData(req) {
             .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];

package/server/routes/menu/controllers/getMenu.js

@@ -36,7 +36,7 @@ export default async function adminMenu({ user = {}, session, pg = pgClients.cli
 
     // update user access
 
-    if (session && user?.uid && !config.local && !config.admin && !user.user_type?.includes?.('admin') && !user.type?.includes?.('admin') && pg.pk['admin.role_access']) {
+    if (session && user?.uid && !user.user_type?.includes?.('admin') && !user.type?.includes?.('admin') && pg.pk['admin.role_access']) {
         const { type, gl = [], routes = [] } = await pg.query(`select user_type as type, b.gl,routes from admin.users a
         left join lateral (
             select array_agg(role_id) as gl from admin.user_roles