@opengis/admin 0.1.98 → 0.1.99

package/module/settings/menu.json

@@ -12,6 +12,12 @@
                 "ua": "Користувачі",
                 "en": "Users"
             },
+            {
+                "path": "admin.accounts",
+                "table": "admin.accounts.table",
+                "ua": "Організації",
+                "en": "Accounts"
+            },
             {
                 "path": "admin.roles",
                 "table": "admin.roles.table",
@@ -23,6 +29,12 @@
                 "table": "admin.routes.table",
                 "ua": "Інтерфейси",
                 "en": "Routes"
+            },
+            {
+                "path": "admin.rules",
+                "table": "admin.rules.table",
+                "ua": "Повноваження",
+                "en": "Rules"
             }
         ]
     },
@@ -55,6 +67,18 @@
                 "table": "admin.custom_column.table",
                 "ua": "Налаштування користувацьких колонок",
                 "en": "User custom column settings"
+            },
+            {
+                "path": "context.account_grants",
+                "table": "context.account_grants.table",
+                "ua": "Налаштування організацій",
+                "en": "Account settings"
+            },
+            {
+                "path": "context.account_users",
+                "table": "context.account_users.table",
+                "ua": "Користувачі/Організації",
+                "en": "Contact/Account"
             }
         ]
     }

package/module/settings/select/core.accounts.sql

@@ -0,0 +1 @@
+select account_id, account_name from admin.accounts order by account_name

package/module/settings/select/core.roles.sql

@@ -1 +1 @@
-select role_id, name from admin.roles order by name
+select role_id, name from admin.roles 

package/module/settings/select/core.rules.sql

@@ -0,0 +1 @@
+select rule_id, rule_name from admin.rules 

package/module/settings/select/core.user_uid.sql

@@ -1,2 +1 @@
 select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users
-order by coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login)

package/module/settings/table/admin.accounts.table.json

@@ -0,0 +1,42 @@
+{
+  "ua": "Організації",
+  "key": "account_id",
+  "form": "admin.accounts.form",
+  "table": "admin.accounts",
+  "order": "cdate desc",
+  "access": "admin",
+  "meta": {
+    "search": "account_name"
+  },
+  "actions": ["add", "edit", "del"],
+  "columns": [
+    {
+      "name": "account_name",
+      "format": "Text",
+      "ua": "Назва"
+    },
+    {
+      "name": "description",
+      "format": "Text",
+      "ua": "Опис"
+    },
+    {
+      "name": "uid",
+      "format": "Select",
+      "data": "core.user_uid",
+      "ua": "Хто створив"
+    },
+    {
+      "name": "cdate",
+      "format": "Date",
+      "ua": "Дата створення"
+    }
+  ],
+  "filters": [
+    {
+      "ua": "Назва",
+      "name": "account_name",
+      "type": "text"
+    }
+  ]
+}

package/module/settings/table/admin.roles.table.json

@@ -15,7 +15,7 @@
             "name": "user_count"
         },
         {
-            "sql": "select count(route_id) as routes_count from admin.access where role_id=t.role_id",
+            "sql": "select count(route_id) as routes_count from admin.role_access where role_id=t.role_id",
             "name": "routes_count"
         }
     ],

package/module/settings/table/admin.routes.table.json

@@ -6,12 +6,12 @@
     "access": "admin",
     "sql": [
         {
-            "sql1": "select count(user_uid) as user_count from admin.access where route_id=t.route_id",
-            "name": "user_count"
+            "sql": "select count(role_id) as roles_count, array_agg(role_id) as role_ids from admin.role_access where route_id=t.route_id",
+            "name": "r"
         },
         {
-            "sql": "select count(role_id) as roles_count from admin.access where route_id=t.route_id",
-            "name": "roles_count"
+            "sql": "select count(user_uid) as user_count  from admin.user_roles where role_id= any(r.role_ids)",
+            "name": "u"
         }
     ],
     "columns": [
@@ -30,6 +30,11 @@
             "format": "text",
             "title": "Кількість груп"
         },
+        {
+            "name": "user_count",
+            "format": "text",
+            "title": "Кількість користувачів"
+        },
         {
             "name": "enabled",
             "format": "Check",

package/module/settings/table/admin.rules.table.json

@@ -0,0 +1,77 @@
+{
+  "ua": "Повноваження",
+  "key": "rule_id",
+  "form": "admin.rules.form",
+  "table": "admin.rules",
+  "access": "admin",
+  "meta": {
+    "search": "rule_name"
+  },
+  "actions": [
+    "add",
+    "edit",
+    "del"
+  ],
+  "columns": [
+    {
+      "name": "rule_name",
+      "format": "Text",
+      "ua": "Назва"
+    },
+    {
+      "name": "attr",
+      "format": "Text",
+      "ua": "Колонка"
+    },
+    {
+      "name": "rule_type",
+      "format": "text",
+      "data": "core.rule_type",
+      "ua": "Тип повноваження"
+    },
+    {
+      "name": "rule_query",
+      "format": "Text",
+      "ua": "Запит"
+    },
+    {
+      "name": "CLS",
+      "format": "Text",
+      "ua": "CLS"
+    },
+    {
+      "name": "routes",
+      "format": "Text",
+      "ua": "Роути"
+    },
+    {
+      "name": "uid",
+      "format": "Select",
+      "data": "core.user_uid",
+      "ua": "Хто створив"
+    },
+    {
+      "name": "cdate",
+      "format": "Date",
+      "ua": "Дата створення"
+    }
+  ],
+  "filters": [
+    {
+      "ua": "Назва",
+      "name": "name",
+      "type": "text"
+    },
+    {
+      "ua": "Тип повноваження",
+      "name": "type",
+      "type": "text"
+    },
+    {
+      "ua": "Хто створив",
+      "name": "uid",
+      "type": "select",
+      "data": "core.user_uid"
+    }
+  ]
+}

package/module/settings/table/admin.users.table.json

@@ -15,17 +15,17 @@
         "search": "sur_name,user_name,uid,father_name,email,phone,login"
     },
     "sql": [
-        {
-            "sql": "select count(*) as group_count from admin.user_roles where user_uid=t.uid and (case when expiration is not null then expiration > CURRENT_DATE else 1=1 end)",
-            "name": "group_count_sql"
-        },
         {
             "sql": "select concat(user_name, ' ', sur_name, ' ', father_name, ' ') as full_name",
             "name": "full_name_sql"
         },
         {
-            "sql": "select string_agg(name,',') as groups from admin.roles where role_id in (select role_id from admin.user_roles where user_uid=t.uid)",
-            "name": "group_list_sql"
+            "sql": "select string_agg(name,',') as groups,count(*) as group_count, array_agg(role_id) as role_ids from admin.roles r where role_id in (select role_id from admin.user_roles where user_uid=t.uid)",
+            "name": "gr"
+        },
+        {
+            "sql": "select count(*) as route_count from admin.role_access r where role_id = any(gr.role_ids)",
+            "name": "routes"
         }
     ],
     "columns": [
@@ -37,6 +37,12 @@
         {
             "ua": "Логін",
             "name": "login",
+            "hidden": true,
+            "format": "text"
+        },
+        {
+            "ua": "Права",
+            "name": "user_type",
             "format": "text"
         },
         {
@@ -56,6 +62,11 @@
             "ua": "Кількість груп",
             "format": "text"
         },
+        {
+            "name": "route_count",
+            "ua": "Кількість Інтерфейсів",
+            "format": "text"
+        },
         {
             "name": "groups",
             "ua": "Групи",

package/module/settings/table/context.account_grants.table.json

@@ -0,0 +1,68 @@
+{
+  "key": "ag_id",
+  "ua": "Організації/Права",
+  "table": "admin.account_grants",
+  "form": "context.account_grants.form",
+  "order": "cdate desc",
+  "access": "admin",
+  "actions": [
+    "add",
+    "edit",
+    "del"
+  ],
+  "columns": [
+    {
+      "name": "account_id",
+      "ua": "id Організації",
+      "format": "Select",
+      "data": "core.accounts"
+    },
+    {
+      "name": "rule_id",
+      "ua": "id Правила",
+      "data": "core.rules",
+      "format": "Select"
+    },
+    {
+      "name": "routes",
+      "ua": "Роути",
+      "format": "Text"
+    },
+    {
+      "name": "values",
+      "ua": "Значення",
+      "format": "Text"
+    },
+    {
+      "name": "grants_doc_id",
+      "ua": "id Документу",
+      "format": "Text"
+    },
+    {
+      "name": "grant_scan",
+      "ua": "id Скану",
+      "format": "Text"
+    },
+    {
+      "name": "expire_date",
+      "ua": "Дата закінчення дії дозволу",
+      "format": "Date"
+    },
+    {
+      "name": "actions",
+      "ua": "Дії",
+      "format": "Text"
+    },
+    {
+      "name": "uid",
+      "format": "Select",
+      "data": "core.user_uid",
+      "ua": "Хто створив"
+    },
+    {
+      "name": "cdate",
+      "ua": "Дата створення",
+      "format": "Dat"
+    }
+  ]
+}

package/module/settings/table/context.account_users.table.json

@@ -0,0 +1,38 @@
+{
+  "key": "au_id",
+  "ua": "Користувачі/Організації",
+  "table": "admin.account_users",
+  "form": "context.account_users.form",
+  "order": "cdate desc",
+  "access": "admin",
+  "actions": [
+    "add",
+    "edit",
+    "del"
+  ],
+  "columns": [
+    {
+      "name": "account_id",
+      "format": "Select",
+      "data": "core.accounts",
+      "ua": "id Організації"
+    },
+    {
+      "name": "user_id",
+      "format": "Select",
+      "data": "core.user_uid",
+      "ua": "id Користувача"
+    },
+    {
+      "name": "uid",
+      "format": "Select",
+      "data": "core.user_uid",
+      "ua": "Хто створив"
+    },
+    {
+      "name": "cdate",
+      "format": "date",
+      "ua": "Дата створення"
+    }
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.1.98",
+  "version": "0.1.99",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -22,7 +22,8 @@
     "build-app": "cross-env APP=true vite build",
     "admin": "cross-env NODE_ENV=admin npm run start",
     "prod": "cross-env NODE_ENV=production npm run start",
-    "start": "node --watch-path=server server vite ",
+    "debug": "node --watch-path=server server",
+    "start": "node server",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",
     "docs:preview": "vitepress preview docs"
@@ -79,4 +80,4 @@
     "vitepress-plugin-tabs": "^0.5.0",
     "vitepress-sidebar": "^1.22.0"
   }
-}
+}

package/server/helpers/core/select.js

@@ -17,6 +17,7 @@ export default async function select(ids, options) {
 
     if (!classifier) return `Не знайдено класифікатор ${data}`;
 
+    const arr = classifier.arr || []
     if (classifier.sql && typeof classifier.sql === 'string') {
 
 
@@ -30,16 +31,13 @@ export default async function select(ids, options) {
       const values = [idsArray.map(id => String(id))];
 
       const { rows } = await pg.query(sql, values);
-      classifier.arr = rows;
+      Object.assign(arr, rows)
 
     }
-
-    if (!Array.isArray(classifier?.arr) || !classifier.arr.length || !classifier.arr.every(item => typeof item === 'object' && item !== null)) {
-      return ids;
-    }
+    if (!arr.length) return idsArray
 
     const results = idsArray.map(id => {
-      const result = classifier.arr.find(el => String(el.id) == String(id));
+      const result = arr.find(el => String(el.id) == String(id));
       return result ? result.text : '';
     });
 

package/server/helpers/list/tableList.js

@@ -3,12 +3,12 @@ import { handlebarsSync, setToken, handlebars } from '@opengis/fastify-table/uti
 import button from '../utils/button.js';
 import buttonDel from '../utils/buttonDel.js';
 
-function format(d, key, data) {
+function format(d, key, data, hash) {
     if (!key?.includes) return '';
     if (d === true) return 'так';
     if (d === false) return 'ні';
     if (key === 'actions') {
-        return button(d, 'редагувати') + buttonDel(d)
+        return (hash.form ? button(d, 'редагувати') : '') + buttonDel(d)
     }
     if (key.includes('{{')) {
         return handlebarsSync.compile(key)(data);
@@ -25,7 +25,7 @@ export default async function tableList(data, opt) {
         return noDataText
     }
     if (!hash.columns) return 'columns empty'
-    const keys = hash.columns.split(',').map(el => hash.comma ? el.trim().replace(new RegExp(hash.comma, 'g'), ',') : el.trim()).concat(hash.uid && hash.table && hash.form && !hash.noactions ? ['Дії', 'actions'] : []);
+    const keys = hash.columns.split(hash.divider || ',').map(el => hash.comma ? el.trim().replace(new RegExp(hash.comma, 'g'), ',') : el.trim()).concat(hash.uid && hash.table && hash.id && !hash.noactions ? ['Дії', 'actions'] : []);
 
     const result = [];
     result.push('<thead> <tr>');
@@ -36,6 +36,9 @@ export default async function tableList(data, opt) {
         const name = keys[i];
 
         // check hbs 
+        if (name.includes('{{')) {
+            console.log(hash)
+        }
         const nameHBS = name.includes('{{') ? handlebarsSync.compile(name)({ ...data, hash }) : false;
         // console.log(name, data, nameHBS)
         skip[name] = name.includes('{{') && !nameHBS;
@@ -50,7 +53,7 @@ export default async function tableList(data, opt) {
     result.push('</tr></thead>');
 
     // body 
-    for (let k = 0; k < data.length; k += 2) {
+    for (let k = 0; k < data.length; k += 1) {
         const row = data[k];
         result.push('<tbody><tr class="border-t border-gray-200">');
         const obj = { form: hash.form, table: hash.table, id: row[hash.id] }
@@ -59,13 +62,13 @@ export default async function tableList(data, opt) {
 
             const name = keys[i];
             const key = keys[i + 1];
-
+            if (!key) continue;
             if (skip[name]) continue;
 
             const tokenData = key == 'actions' ? token : null;
             const d1 = ['{{format', '{{select', '{{badge', '{{#ifCond'].filter(el => key.includes(el)).length ? await handlebars.compile(key)({ ...row, token, hash }) || '-' : null
             result.push(`<td >
-                                <div class="px-[20px] py-[12px] text-start font-medium text-[14px] text-black">${d1 || format(tokenData || row[key], key, row)}</div>
+                                <div class="px-[20px] py-[12px] text-start font-medium text-[14px] text-black">${d1 || format(tokenData || row[key], key, row, hash)}</div>
                             </td>`);
 
         }

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

@@ -18,7 +18,7 @@ export default async function accessGroup({
     if (check) return check;
 
     const { rows: routes = [] } = await pg.query(`select a.route_id as path, b.actions from admin.routes a 
-    left join admin.access b on a.route_id=b.route_id
+    left join admin.role_access b on a.route_id=b.route_id
     where b.role_id=$1`, [params.id]);
 
     const { rows: users = [] } = await pg.query(`select user_uid as id, user_name as name, access_granted, 

package/server/routes/access/controllers/access.group.post.js

@@ -21,15 +21,15 @@ export default async function accessGroupPost({
     }
 
     if (routes?.length) {
-        // delete from admin.access where role_id=$1;
-        await pg.query(`delete from admin.access where role_id=$1;`, [id]);
 
+        await pg.query(`delete from admin.role_access where role_id=$1;`, [id]);
 
-        const q = `insert into admin.access(role_id,route_id,actions)   values ($1,$2,$3)`;
+
+        const q = `insert into admin.role_access(role_id,route_id,actions)   values ($1,$2,$3)`;
         await Promise.all(routes.filter(el => el.actions).map(el => pg.query(q, [id, el.path, el.actions])))
 
         const { rows } = await pg.query(`select a.route_id as path, b.actions as actions from admin.routes a 
-            left join admin.access b on a.route_id=b.route_id
+            left join admin.role_access b on a.route_id=b.route_id
             where b.role_id=$1`, [id]);
 
         if (!users?.length) {

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

@@ -30,6 +30,17 @@ export default async function getCardData(req) {
     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 })
+        })
+    })
+
+
     // tokens result
     const tokens = {};
     if (index?.tokens && typeof index?.tokens === 'object' && !Array.isArray(index?.tokens)) {

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

@@ -3,17 +3,26 @@ import { getOpt } from '@opengis/fastify-table/utils.js';
 // import getData from '../../../../../../npm/fastify-table/server/routes/table/controllers/data.js';
 
 export default async function getTableData(req) {
-    //const time = Date.now();
+    const { user } = req
     const tokenData = await getOpt(req.params.table, req.user?.uid);
     if (tokenData) {
         const { rows } = await req.pg.query(`select ${tokenData.columns || '*'} from ${tokenData.table} where ${tokenData.query || 'true'} limit 10`)
         return { rows }
     }
+
+    // Це можна 1 раз на старті 
     const interfaceName = req.headers?.referer?.match(/.*\/([^?]+)/)?.[1];
-    const { query = '1=1' } = interfaceName ? await req.pg.query(`select query from admin.routes where route_id=$1`, [interfaceName])
-        .then((res1) => res1.rows?.[0] || {}) : {};
+    const { query } = interfaceName ?
+        await req.pg.query(`select query from admin.routes where route_id=$1`, [interfaceName])
+            .then((res1) => res1.rows?.[0] || {}) : {};
+
+    // це можна від користувача
+    const { rows = [] } = await req.pg.query(`select attr,(select rule_values from admin.account_grants where account_id in (select account_id from admin.account_users where user_uid=$2) and rule_id=r.rule_id limit 1) from admin.rules r where (select route_id from admin.routes where $1 in (alias,table_name)) = any(routes)`, [req.params.table, user.uid]);
+
+
+    const context = rows.filter(el => el.rule_values).map(el => `${el.attr} = any ('{${el.rule_values}}')`).join(' and ')
+    req.params.query = [query, context].filter(el => el).join(' and ') || ' true ';
 
-    req.params.query = query;
     const res = await getData(req);
 
     return res;

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

@@ -35,34 +35,21 @@ export default async function adminMenu({ user = {}, session, pg = pgClients.cli
     const menus = isProduction && menuCache.length ? menuCache : await readMenu();
 
     // update user access
-    if (session && user?.uid) {
-        const { type, gl = [] } = await pg.query(`select user_type as type, b.gl from admin.users a
-        left join lateral (
-            select array_agg(role_id) as gl from admin.user_roles where user_uid=a.uid
-        )b on 1=1 where uid=$1`, [user.uid]).then(el => el.rows[0] || {});
-        /* const { interfaces = [] } = await pg.query(`select array_agg(route_id) as interfaces from admin.access
+    if (session && user?.uid && user.type !== 'admin') {
+        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 where user_uid=a.uid)b on 1=1
+        left join lateral ( select array_agg(route_id) as routes from admin.role_access where role_id=any(b.gl))r on 1=1
+        where uid=$1`, [user.uid]).then(el => el.rows[0] || {});
+        /* const { interfaces = [] } = await pg.query(`select array_agg(route_id) as interfaces from admin.role_access
         where user_uid=$1 or role_id=any($2::text[])`, [user.uid, gl]).then((res) => res.rows?.[0] || {}); */
-        Object.assign(user, { type, group_list: gl });
+
+        Object.assign(user, { type, group_list: gl, routes });
         session?.set?.('passport', { user });
+        const userMenus = menus.map(el => (el.menu ? { ...el, menu: el.menu.filter(item => routes.includes(item.path)) } : el))
+        return userMenus.filter(el => el.menu?.length || routes.includes(el.path))
     }
-    return menus;
 
-    if (req) {
-        const user = req?.session?.passport?.user || {};
-        const userMenu = await Promise.all(menus.map(async (menu) => {
-            if (menu?.menu?.length) {
-                const submenu = await Promise.all(menu.menu?.map(async (submenu) => {
-                    const access = await getAccess({ table: submenu?.table, user });
-                    return { ...submenu, access };
-                }));
-                return { ...menu, menu: submenu.filter((e) => e?.access), access: submenu.filter((e) => e?.access?.actions?.includes('get'))?.length };
-            } else if (menu?.table) {
-                const access = await getAccess({ table: menu?.table, user });
-                return { ...menu, access };
-            }
-            return menu;
-        }));
-        return userMenu.filter((e) => e?.access)?.map((e) => ({ ...e, menu: e?.menu ? e?.menu?.filter((el) => el?.access?.actions?.includes('get')) : undefined }));
-    }
     return menus;
+
+
 }

package/module/settings/select/core.roles.json

@@ -1,3 +0,0 @@
-{
-    "count": 1000
-}