@opengis/admin 0.3.24 → 0.3.26

package/server/routes/data/controllers/utils/assignTokens.js

@@ -1,31 +1,31 @@
-import { config, setToken } from "@opengis/fastify-table/utils.js";
-
-export default function assignTokens({
-    rows = [], ispublic, uid, loadTable = {},
-}) {
-    if (config?.security?.disableToken) return;
-
-    if (!config?.auth?.disable && !ispublic && !uid) throw new Error('empty user');
-    if (!loadTable?.table || !(loadTable?.form || loadTable?.add_form)) return null;
-
-    const form = loadTable?.form || loadTable?.add_form;
-    const addTokens = setToken({
-        ids: [JSON.stringify({ add: loadTable.table, form })],
-        mode: 'a',
-        uid: config?.auth?.disable || ispublic ? '1' : uid,
-        array: 1,
-    });
-    if (!rows.length) return addTokens[0];
-
-    rows.forEach((row) => {
-        const editTokens = setToken({
-            ids: [JSON.stringify({ id: row.id, table: loadTable.table, form })],
-            mode: 'w',
-            uid: config?.auth?.disable || ispublic ? '1' : uid,
-            array: 1,
-        });
-        Object.assign(row, { token: editTokens[0] });
-    });
-    return addTokens[0];
-
+import { config, setToken } from "@opengis/fastify-table/utils.js";
+
+export default function assignTokens({
+    rows = [], ispublic, uid, loadTable = {},
+}) {
+    if (config?.security?.disableToken) return;
+
+    if (!config?.auth?.disable && !ispublic && !uid) throw new Error('empty user');
+    if (!loadTable?.table || !(loadTable?.form || loadTable?.add_form)) return null;
+
+    const form = loadTable?.form || loadTable?.add_form;
+    const addTokens = setToken({
+        ids: [JSON.stringify({ add: loadTable.table, form })],
+        mode: 'a',
+        uid: config?.auth?.disable || ispublic ? '1' : uid,
+        array: 1,
+    });
+    if (!rows.length) return addTokens[0];
+
+    rows.forEach((row) => {
+        const editTokens = setToken({
+            ids: [JSON.stringify({ id: row.id, table: loadTable.table, form })],
+            mode: 'w',
+            uid: config?.auth?.disable || ispublic ? '1' : uid,
+            array: 1,
+        });
+        Object.assign(row, { token: editTokens[0] });
+    });
+    return addTokens[0];
+
 }

package/server/routes/data/controllers/utils/getColumns.js

@@ -1,9 +1,9 @@
-import { getTemplate } from "@opengis/fastify-table/utils.js";
-
-export default async function getColumns({
-    columns = [], params = {}, opt = {}, loadTable = {}, form, table, dbColumns = [], mode = 'table',
-}) {
-    const columnList = dbColumns.map((el) => el.name || el).join(',');
-    const cols = columns.filter((el) => columnList.includes(el?.name) && el?.name !== 'geom').map((el) => el?.name || el).join(',');
-    return { cols, columnList };
+import { getTemplate } from "@opengis/fastify-table/utils.js";
+
+export default async function getColumns({
+    columns = [], params = {}, opt = {}, loadTable = {}, form, table, dbColumns = [], mode = 'table',
+}) {
+    const columnList = dbColumns.map((el) => el.name || el).join(',');
+    const cols = columns.filter((el) => columnList.includes(el?.name) && el?.name !== 'geom').map((el) => el?.name || el).join(',');
+    return { cols, columnList };
 }

package/server/routes/data/index.mjs

@@ -1,20 +1,20 @@
-
-import tableData from "./controllers/tableData.js";
-import tokenInfo from "./controllers/tokenInfo.js";
-// import tableDataId from "./controllers/tableDataId.js";
-import cardData from "./controllers/cardData.js";
-import cardTabData from './controllers/cardTabData.js';
-import tableFilter from "./controllers/tableFilter.js";
-
-import { tableDataSchema, tableDataIdSchema, tableFilterSchema, cardTabDataSchema } from './schema.js';
-import tableInfo from "./controllers/tableInfo.js";
-
-export default async function route(fastify) {
-    const policy = ['user'];
-    fastify.get(`/token-info/:token`, { config: { policy: ['admin'] } }, tokenInfo);
-    fastify.get(`/table-data/:table`, { config: { policy }, schema: tableDataSchema }, tableData);
-    fastify.get(`/card-data/:token`, { config: { policy }, scheme: cardTabDataSchema }, cardTabData);
-    fastify.get(`/table-data/:table/:id`, { config: { policy }, schema: tableDataIdSchema }, cardData);
-    fastify.get(`/table-filter/:table`, { config: { policy }, schema: tableFilterSchema }, tableFilter);
-    fastify.get(`/table-info/:table/:id?`, { config: { policy }, schema: tableDataSchema }, tableInfo);
-}
+
+import tableData from "./controllers/tableData.js";
+import tokenInfo from "./controllers/tokenInfo.js";
+// import tableDataId from "./controllers/tableDataId.js";
+import cardData from "./controllers/cardData.js";
+import cardTabData from './controllers/cardTabData.js';
+import tableFilter from "./controllers/tableFilter.js";
+
+import { tableDataSchema, tableDataIdSchema, tableFilterSchema, cardTabDataSchema } from './schema.js';
+import tableInfo from "./controllers/tableInfo.js";
+
+export default async function route(fastify) {
+    const policy = ['user'];
+    fastify.get(`/token-info/:token`, { config: { policy: ['admin'] } }, tokenInfo);
+    fastify.get(`/table-data/:table`, { config: { policy }, schema: tableDataSchema }, tableData);
+    fastify.get(`/card-data/:token`, { config: { policy }, scheme: cardTabDataSchema }, cardTabData);
+    fastify.get(`/table-data/:table/:id`, { config: { policy }, schema: tableDataIdSchema }, cardData);
+    fastify.get(`/table-filter/:table`, { config: { policy }, schema: tableFilterSchema }, tableFilter);
+    fastify.get(`/table-info/:table/:id?`, { config: { policy }, schema: tableDataSchema }, tableInfo);
+}

package/server/routes/data/schema.js

@@ -1,54 +1,54 @@
-const tableDataSchema = {
-    querystring: {
-        limit: { type: 'string', pattern: '^(\\d+)$' },
-        page: { type: 'string', pattern: '^(\\d+)$' },
-        // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-        // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-        order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        desc: { type: 'string', pattern: '^(\\d+)$' },
-        state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
-        polyline: { type: 'string', pattern: '^([\\d\\w|@{}~_`]+)$' },
-        // key: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-        sql: { type: 'string', pattern: '^(\\d)$' },
-    },
-    params: {
-        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    }
-};
-
-const tableDataIdSchema = {
-    params: {
-        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    }
-};
-
-const tableFilterSchema = {
-    params: {
-        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    }
-};
-
-const cardDataSchema = {
-    params: {
-        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        table: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    }
-};
-
-const cardTabDataSchema = {
-    querystring: {
-        sql: { type: 'string', pattern: '^(\\d)$' }
-    },
-    params: {
-        token: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    }
-};
-export { 
-    tableDataSchema, tableDataIdSchema, tableFilterSchema,
-    cardDataSchema, cardTabDataSchema
- }
-export default null;
+const tableDataSchema = {
+    querystring: {
+        limit: { type: 'string', pattern: '^(\\d+)$' },
+        page: { type: 'string', pattern: '^(\\d+)$' },
+        // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+        // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+        order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        desc: { type: 'string', pattern: '^(\\d+)$' },
+        state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
+        polyline: { type: 'string', pattern: '^([\\d\\w|@{}~_`]+)$' },
+        // key: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+        sql: { type: 'string', pattern: '^(\\d)$' },
+    },
+    params: {
+        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    }
+};
+
+const tableDataIdSchema = {
+    params: {
+        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    }
+};
+
+const tableFilterSchema = {
+    params: {
+        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    }
+};
+
+const cardDataSchema = {
+    params: {
+        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        table: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    }
+};
+
+const cardTabDataSchema = {
+    querystring: {
+        sql: { type: 'string', pattern: '^(\\d)$' }
+    },
+    params: {
+        token: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    }
+};
+export { 
+    tableDataSchema, tableDataIdSchema, tableFilterSchema,
+    cardDataSchema, cardTabDataSchema
+ }
+export default null;

package/server/routes/dblist/controllers/readItems.js

@@ -1,20 +1,20 @@
-import { dblist, getRedis } from '@opengis/fastify-table/utils.js';
-
-import formatData from '../utils/formatData.js';
-
-const rclient = getRedis();
-
-export default async function readItemList(req) {
-  const rows = formatData(dblist);
-  const uid = req.session.passport?.user?.uid // login db
-    || req.session.passport?.user?.username // login passwd
-    || '2';
-
-  const key = `current-db:${uid}`;
-  const ttl = await rclient.ttl(key);
-  const currentId = await rclient.get(key);
-  rclient.setex(key, 60 * 60 * 10000, currentId);
-
-  const { originalMaxAge, expires } = req.session?.cookie || {};
-  return { ttl, current: currentId || rows[0]?.id, rows, user: { ...req.user, originalMaxAge, expires, uid }, };
-}
+import { dblist, getRedis } from '@opengis/fastify-table/utils.js';
+
+import formatData from '../utils/formatData.js';
+
+const rclient = getRedis();
+
+export default async function readItemList(req) {
+  const rows = formatData(dblist);
+  const uid = req.session.passport?.user?.uid // login db
+    || req.session.passport?.user?.username // login passwd
+    || '2';
+
+  const key = `current-db:${uid}`;
+  const ttl = await rclient.ttl(key);
+  const currentId = await rclient.get(key);
+  rclient.setex(key, 60 * 60 * 10000, currentId);
+
+  const { originalMaxAge, expires } = req.session?.cookie || {};
+  return { ttl, current: currentId || rows[0]?.id, rows, user: { ...req.user, originalMaxAge, expires, uid }, };
+}

package/server/routes/dblist/controllers/setItem.js

@@ -1,22 +1,22 @@
-import { dblist, getRedis } from '@opengis/fastify-table/utils.js';
-
-export default async function setItem(req) {
-  const { params = {} } = req;
-  const { id } = params;
-
-  if (!id) return { error: 'not enough params', status: 400 };
-
-  const current = dblist.find((el) => [el.id, el.key].includes(id));
-  if (!current?.database) {
-    return { error: 'invalid param id', status: 400 };
-  }
-
-  const rclient = getRedis();
-  const uid = req.session.passport?.user?.uid // login db
-    || req.session.passport?.user?.username // login passwd
-    || '2';
-
-  await rclient.setex(`current-db:${uid}`, 60 * 60 * 10000, id);
-
-  return { current: id };
-}
+import { dblist, getRedis } from '@opengis/fastify-table/utils.js';
+
+export default async function setItem(req) {
+  const { params = {} } = req;
+  const { id } = params;
+
+  if (!id) return { error: 'not enough params', status: 400 };
+
+  const current = dblist.find((el) => [el.id, el.key].includes(id));
+  if (!current?.database) {
+    return { error: 'invalid param id', status: 400 };
+  }
+
+  const rclient = getRedis();
+  const uid = req.session.passport?.user?.uid // login db
+    || req.session.passport?.user?.username // login passwd
+    || '2';
+
+  await rclient.setex(`current-db:${uid}`, 60 * 60 * 10000, id);
+
+  return { current: id };
+}

package/server/routes/dblist/index.mjs

@@ -1,18 +1,18 @@
-import readItemList from './controllers/readItems.js';
-import setItem from './controllers/setItem.js';
-
-export default async function plugin(fastify) {
-
-  fastify.route({
-    method: 'GET',
-    url: '/db-list',
-    config: { policy: ['site'] },
-    handler: readItemList,
-  });
-  fastify.route({
-    method: 'GET',
-    url: '/db-list/:id',
-    config: { policy: ['site'] },
-    handler: setItem,
-  });
-}
+import readItemList from './controllers/readItems.js';
+import setItem from './controllers/setItem.js';
+
+export default async function plugin(fastify) {
+
+  fastify.route({
+    method: 'GET',
+    url: '/db-list',
+    config: { policy: ['site'] },
+    handler: readItemList,
+  });
+  fastify.route({
+    method: 'GET',
+    url: '/db-list/:id',
+    config: { policy: ['site'] },
+    handler: setItem,
+  });
+}

package/server/routes/dblist/utils/formatData.js

@@ -1,7 +1,7 @@
-const showKeys = ['id', 'key', 'title'];
-
-export default function formatData(data = []) {
-  return data?.length
-    ? data.map((el) => Object.keys(el).filter((key) => showKeys.includes(key)).reduce((acc, curr) => Object.assign(acc, { [curr]: el[curr] }), {}))
-    : [];
-}
+const showKeys = ['id', 'key', 'title'];
+
+export default function formatData(data = []) {
+  return data?.length
+    ? data.map((el) => Object.keys(el).filter((key) => showKeys.includes(key)).reduce((acc, curr) => Object.assign(acc, { [curr]: el[curr] }), {}))
+    : [];
+}

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

@@ -1,78 +1,78 @@
-
-import { join } from 'path';
-import { userTemplateDir, pgClients, applyHook, config } from '@opengis/fastify-table/utils.js';
-
-import { existsSync, readdirSync, readFileSync } from 'fs';
-const menuCache = [];
-// check module dir
-const moduleDir = join(process.cwd(), 'module');
-const dirs = existsSync(moduleDir) ?
-    readdirSync(moduleDir).map(el => join(moduleDir, el)) : [];
-
-// all menu files module + user 
-
-
-
-const isProduction = process.env.NODE_ENV === 'production';
-// readMenu();
-
-async function readMenu() {
-    const menuList = dirs.concat(userTemplateDir)
-        .map(el => join(el, 'menu.json'))
-        .filter(el => existsSync(el))
-    // const list = menuList.map(el => readFileSync(el, 'utf-8')); // sync 
-    const list = menuList.filter((el, idx, arr) => el && arr.indexOf(el) === idx).map(el => readFileSync(el, 'utf-8')); // sync 
-    const menus = list.reduce((p, el) => p.concat(JSON.parse(el)), [])
-        .map(el => ({ order: 0, ...el }))
-        .sort((a, b) => (a.order > b.order) ? 1 : ((b.order > a.order) ? -1 : 0))
-
-    if (!menuCache.length) menus.forEach(el => menuCache.push(el))
-    return menus;
-}
-export default async function adminMenu({ user = {}, session, pg = pgClients.client }) {
-    const time = Date.now();
-    if (!user.uid) return { status: 403, message: 'access restricted' }
-
-    const menus = isProduction && menuCache.length ? menuCache : await readMenu();
-
-    const { rows } = await pgClients.client.query(`select property_key as key,property_text as val from admin.properties where property_key~'^(${config.settingKeys || 'site|map|admin'})'`);
-    const settings = rows.reduce((p, { key, val }) => { const [k1, k2] = key.split('.'); p[k1] = p[k1] || {}; p[k1][k2] = val; return p }, {});
-    // update user access
-    const { user_name, sur_name, father_name, email, phone, uid } = user;
-    const result = { settings, user: { uid, user_name, sur_name, father_name, email, phone } };
-    await applyHook('userMenu', result);
-
-    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 
-            where   user_uid=a.uid 
-            and     role_id in ( select role_id from admin.roles where enabled)
-        )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, routes });
-        session?.set?.('passport', { user });
-
-        if (type?.includes?.('admin')) {
-            return { time: Date.now() - time, menus, ...result };
-        }
-
-        const userMenus = menus.map(el => (el.menu ? { ...el, menu: el.menu.filter(item => routes?.includes(item.path)) } : el))
-        const filtered = userMenus.filter(el => el.menu?.length || routes?.includes(el.path));
-        return { time: Date.now() - time, menus: filtered, ...result }
-        // .filter((el, idx, arr) => arr.map((el) => el?.ua || el?.en || el?.name).indexOf(el?.ua || el?.en || el?.name) === idx)
-    }
-
-    // skip dupes?
-    // .filter((el, idx, arr) => arr.map((el) => el?.ua || el?.en || el?.name).indexOf(el?.ua || el?.en || el?.name) === idx)
-
-    return { time: Date.now() - time, menus, ...result };
-
-
+
+import { join } from 'path';
+import { userTemplateDir, pgClients, applyHook, config } from '@opengis/fastify-table/utils.js';
+
+import { existsSync, readdirSync, readFileSync } from 'fs';
+const menuCache = [];
+// check module dir
+const moduleDir = join(process.cwd(), 'module');
+const dirs = existsSync(moduleDir) ?
+    readdirSync(moduleDir).map(el => join(moduleDir, el)) : [];
+
+// all menu files module + user 
+
+
+
+const isProduction = process.env.NODE_ENV === 'production';
+// readMenu();
+
+async function readMenu() {
+    const menuList = dirs.concat(userTemplateDir)
+        .map(el => join(el, 'menu.json'))
+        .filter(el => existsSync(el))
+    // const list = menuList.map(el => readFileSync(el, 'utf-8')); // sync 
+    const list = menuList.filter((el, idx, arr) => el && arr.indexOf(el) === idx).map(el => readFileSync(el, 'utf-8')); // sync 
+    const menus = list.reduce((p, el) => p.concat(JSON.parse(el)), [])
+        .map(el => ({ order: 0, ...el }))
+        .sort((a, b) => (a.order > b.order) ? 1 : ((b.order > a.order) ? -1 : 0))
+
+    if (!menuCache.length) menus.forEach(el => menuCache.push(el))
+    return menus;
+}
+export default async function adminMenu({ user = {}, session, pg = pgClients.client }) {
+    const time = Date.now();
+    if (!user.uid) return { status: 403, message: 'access restricted' }
+
+    const menus = isProduction && menuCache.length ? menuCache : await readMenu();
+
+    const { rows } = await pgClients.client.query(`select property_key as key,property_text as val from admin.properties where property_key~'^(${config.settingKeys || 'site|map|admin'})'`);
+    const settings = rows.reduce((p, { key, val }) => { const [k1, k2] = key.split('.'); p[k1] = p[k1] || {}; p[k1][k2] = val; return p }, {});
+    // update user access
+    const { user_name, sur_name, father_name, email, phone, uid } = user;
+    const result = { settings, user: { uid, user_name, sur_name, father_name, email, phone } };
+    await applyHook('userMenu', result);
+
+    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 
+            where   user_uid=a.uid 
+            and     role_id in ( select role_id from admin.roles where enabled)
+        )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, routes });
+        session?.set?.('passport', { user });
+
+        if (type?.includes?.('admin')) {
+            return { time: Date.now() - time, menus, ...result };
+        }
+
+        const userMenus = menus.map(el => (el.menu ? { ...el, menu: el.menu.filter(item => routes?.includes(item.path)) } : el))
+        const filtered = userMenus.filter(el => el.menu?.length || routes?.includes(el.path));
+        return { time: Date.now() - time, menus: filtered, ...result }
+        // .filter((el, idx, arr) => arr.map((el) => el?.ua || el?.en || el?.name).indexOf(el?.ua || el?.en || el?.name) === idx)
+    }
+
+    // skip dupes?
+    // .filter((el, idx, arr) => arr.map((el) => el?.ua || el?.en || el?.name).indexOf(el?.ua || el?.en || el?.name) === idx)
+
+    return { time: Date.now() - time, menus, ...result };
+
+
 }

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

@@ -1,21 +1,21 @@
-import { pgClients, getTemplatePath } from '@opengis/fastify-table/utils.js';
-
-export default async function adminMenu({ pg = pgClients.client }) {
-    const { rows = [] } = await pg.query(`select route_id, alias, table_name, title, enabled from admin.routes`);
-
-    const interfaces = rows
-        .filter((el, idx, arr) => el.table_name && arr.findIndex(item => item.route_id === el.route_id) === idx)
-        .filter(el => pg.pk?.[el.table_name || ''])
-        .filter(el => !['log.', 'admin.', 'setting.'].find(item => el.table_name.startsWith(item)))
-        .map(el => ({
-            title: el.title,
-            alias: el.alias,
-            table: el.table_name,
-            route: el.route_id,
-            enabled: el.enabled,
-        }));
-
-    const all = getTemplatePath('table').map(el => el[0]);
-
-    return interfaces.filter(el => el.alias && all.includes(el.alias));
+import { pgClients, getTemplatePath } from '@opengis/fastify-table/utils.js';
+
+export default async function adminMenu({ pg = pgClients.client }) {
+    const { rows = [] } = await pg.query(`select route_id, alias, table_name, title, enabled from admin.routes`);
+
+    const interfaces = rows
+        .filter((el, idx, arr) => el.table_name && arr.findIndex(item => item.route_id === el.route_id) === idx)
+        .filter(el => pg.pk?.[el.table_name || ''])
+        .filter(el => !['log.', 'admin.', 'setting.'].find(item => el.table_name.startsWith(item)))
+        .map(el => ({
+            title: el.title,
+            alias: el.alias,
+            table: el.table_name,
+            route: el.route_id,
+            enabled: el.enabled,
+        }));
+
+    const all = getTemplatePath('table').map(el => el[0]);
+
+    return interfaces.filter(el => el.alias && all.includes(el.alias));
 }

package/server/routes/menu/index.mjs

@@ -1,7 +1,7 @@
-import getMenu from './controllers/getMenu.js';
-import interfaces from './controllers/interfaces.js';
-
-export default async function (fastify, opts) {
-  fastify.get(`/user-menu`, getMenu);
-  fastify.get(`/interfaces`, { config: { policy: ['admin'] } }, interfaces);
-}
+import getMenu from './controllers/getMenu.js';
+import interfaces from './controllers/interfaces.js';
+
+export default async function (fastify, opts) {
+  fastify.get(`/user-menu`, getMenu);
+  fastify.get(`/interfaces`, { config: { policy: ['admin'] } }, interfaces);
+}

package/server/routes/notifications/controllers/readNotifications.js

@@ -1,27 +1,27 @@
-export default async function readNotifications({
-  pg, params = {}, query = {}, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-
-    const { userId } = await pg.query('select uid as "userId" from admin.users where $1 in (uid,login) limit 1', [uid])
-      .then((res) => res.rows?.[0] || {});
-
-    if (!userId) {
-      return { message: 'access restricted: 2', status: 403 };
-    }
-
-    const q = `update crm.notifications set read=true where read is not true 
-    and ${params?.id ? 'notification_id=$2' : '1=1'} and addressee_id=$1`;
-
-    if (query.sql) return q;
-
-    const { rowCount = 0 } = await pg.query(q, [userId, params?.id].filter((el) => el));
-
-    return { message: `${rowCount} unread notifications marked as read`, status: 200 };
-
-}
+export default async function readNotifications({
+  pg, params = {}, query = {}, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+
+    const { userId } = await pg.query('select uid as "userId" from admin.users where $1 in (uid,login) limit 1', [uid])
+      .then((res) => res.rows?.[0] || {});
+
+    if (!userId) {
+      return { message: 'access restricted: 2', status: 403 };
+    }
+
+    const q = `update crm.notifications set read=true where read is not true 
+    and ${params?.id ? 'notification_id=$2' : '1=1'} and addressee_id=$1`;
+
+    if (query.sql) return q;
+
+    const { rowCount = 0 } = await pg.query(q, [userId, params?.id].filter((el) => el));
+
+    return { message: `${rowCount} unread notifications marked as read`, status: 200 };
+
+}