@opengis/admin 0.1.41 → 0.1.43

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

@@ -1,120 +1,120 @@
-{
-    "key": "uid",
-    "ua": "Користувачі",
-    "table": "admin.users",
-    "form": "admin.users.form",
-    "order": "cdate desc",
-    "action": [
-        "edit",
-        "del"
-    ],
-    "meta": {
-        "title": "user_name",
-        "search": "sur_name,user_name,uid,father_name,email,phone,login"
-    },
-    "sql": [
-        {
-            "sql": "select count(*) as group_count from admin.user_group_rel where user_uid=t.uid",
-            "name": "group_count_sql"
-        },
-        {
-            "sql": "select concat(user_name, ' ', sur_name, ' ', father_name, ' ') as full_name",
-            "name": "full_name_sql"
-        },
-        {
-            "sql": "select string_agg(group_name,',') as groups from admin.user_group where user_group_id in (select user_group_id from admin.user_group_rel where user_uid=t.uid)",
-            "name": "group_list_sql"
-        }
-    ],
-    "columns": [
-        {
-            "ua": "ПІБ",
-            "name": "full_name",
-            "format": "text"
-        },
-        {
-            "ua": "Логін",
-            "name": "login",
-            "format": "text"
-        },
-        {
-            "ua": "Email",
-            "name": "email",
-            "hidden": true,
-            "format": "text"
-        },
-        {
-            "ua": "РНОКПП",
-            "name": "user_rnokpp",
-            "hidden": true,
-            "format": "text"
-        },
-        {
-            "name": "group_count",
-            "ua": "Кількість груп",
-            "format": "text"
-        },
-        {
-            "name": "groups",
-            "ua": "Групи",
-            "hidden": true,
-            "format": "text"
-        },
-        {
-            "name": "cdate",
-            "ua": "Створено",
-            "format": "date"
-        },
-        {
-            "name": "editor_date",
-            "ua": "Дата останньої активності",
-            "format": "date"
-        },
-        {
-            "name": "enabled",
-            "ua": "Вимикач",
-            "data": "yes_no",
-            "format": "select"
-        }
-    ],
-    "filter_list": [
-        {
-            "ua": "РНОКПП",
-            "name": "user_rnokpp",
-            "type": "Text"
-        },
-        {
-            "ua": "Код ЄДРПОУ",
-            "name": "organ_edrpou",
-            "type": "Text"
-        },
-        {
-            "ua": "Email",
-            "name": "email",
-            "type": "Text"
-        },
-        {
-            "en": "Group",
-            "ua": "Група",
-            "name": "groups",
-            "type": "Text"
-        },
-        {
-            "en": "On/Off",
-            "ua": "On/Off",
-            "data": "enabled",
-            "name": "enabled",
-            "type": "Check"
-        },
-        {
-            "ua": "Дата створення",
-            "name": "cdate",
-            "type": "Date"
-        },
-        {
-            "name": "editor_date",
-            "type": "Date",
-            "ua": "Дата останньої активності"
-        }
-    ]
+{
+    "key": "uid",
+    "ua": "Користувачі",
+    "table": "admin.users",
+    "form": "admin.users.form",
+    "order": "cdate desc",
+    "action": [
+        "edit",
+        "del"
+    ],
+    "meta": {
+        "title": "user_name",
+        "search": "sur_name,user_name,uid,father_name,email,phone,login"
+    },
+    "sql": [
+        {
+            "sql": "select count(*) as group_count from admin.user_group_rel where user_uid=t.uid",
+            "name": "group_count_sql"
+        },
+        {
+            "sql": "select concat(user_name, ' ', sur_name, ' ', father_name, ' ') as full_name",
+            "name": "full_name_sql"
+        },
+        {
+            "sql": "select string_agg(group_name,',') as groups from admin.user_group where user_group_id in (select user_group_id from admin.user_group_rel where user_uid=t.uid)",
+            "name": "group_list_sql"
+        }
+    ],
+    "columns": [
+        {
+            "ua": "ПІБ",
+            "name": "full_name",
+            "format": "text"
+        },
+        {
+            "ua": "Логін",
+            "name": "login",
+            "format": "text"
+        },
+        {
+            "ua": "Email",
+            "name": "email",
+            "hidden": true,
+            "format": "text"
+        },
+        {
+            "ua": "РНОКПП",
+            "name": "user_rnokpp",
+            "hidden": true,
+            "format": "text"
+        },
+        {
+            "name": "group_count",
+            "ua": "Кількість груп",
+            "format": "text"
+        },
+        {
+            "name": "groups",
+            "ua": "Групи",
+            "hidden": true,
+            "format": "text"
+        },
+        {
+            "name": "cdate",
+            "ua": "Створено",
+            "format": "date"
+        },
+        {
+            "name": "editor_date",
+            "ua": "Дата останньої активності",
+            "format": "date"
+        },
+        {
+            "name": "enabled",
+            "ua": "Вимикач",
+            "data": "yes_no",
+            "format": "select"
+        }
+    ],
+    "filter_list": [
+        {
+            "ua": "РНОКПП",
+            "name": "user_rnokpp",
+            "type": "Text"
+        },
+        {
+            "ua": "Код ЄДРПОУ",
+            "name": "organ_edrpou",
+            "type": "Text"
+        },
+        {
+            "ua": "Email",
+            "name": "email",
+            "type": "Text"
+        },
+        {
+            "en": "Group",
+            "ua": "Група",
+            "name": "groups",
+            "type": "Text"
+        },
+        {
+            "en": "On/Off",
+            "ua": "On/Off",
+            "data": "enabled",
+            "name": "enabled",
+            "type": "Check"
+        },
+        {
+            "ua": "Дата створення",
+            "name": "cdate",
+            "type": "Date"
+        },
+        {
+            "name": "editor_date",
+            "type": "Date",
+            "ua": "Дата останньої активності"
+        }
+    ]
 }

package/package.json

@@ -1,74 +1,78 @@
-{
-  "name": "@opengis/admin",
-  "version": "0.1.41",
-  "description": "This project Softpro Admin",
-  "main": "dist/admin.js",
-  "type": "module",
-  "directories": {
-    "test": "test"
-  },
-  "files": [
-    "dist/*",
-    "module/*",
-    "server/*",
-    "plugin.js",
-    "utils.js",
-    "config.js"
-  ],
-  "scripts": {
-    "test": "node --test test/**/*.test.js",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "build": "vite build",
-    "build-app": "cross-env APP=true vite build",
-    "admin": "cross-env NODE_ENV=admin npm run start",
-    "admin1": "cross-env NODE_ENV=admin1 npm run start",
-    "prod": "cross-env NODE_ENV=production npm run start",
-    "start": "node --watch-path=server server vite ",
-    "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs"
-  },
-  "keywords": [],
-  "author": "Softpro",
-  "license": "ISC",
-  "dependencies": {
-    "@opengis/fastify-auth": "^1.0.35",
-    "@opengis/fastify-file": "^1.0.17",
-    "@opengis/fastify-table": "^1.1.27",
-    "@opengis/v3-core": "^0.1.105",
-    "@opengis/v3-filter": "^0.0.31",
-     "@tiptap/core": "^2.8.0",
-    "@tiptap/extension-mention": "^2.8.0",
-    "@tiptap/extension-placeholder": "^2.8.0",
-    "@tiptap/pm": "^2.8.0",
-    "@tiptap/starter-kit": "^2.8.0",
-    "@tiptap/suggestion": "^2.8.0",
-    "@tiptap/vue-3": "^2.8.0",
-    "@turf/turf": "^7.1.0",
-    "@vitejs/plugin-vue": "^5.0.4",
-    "close-with-grace": "^1.3.0",
-    "cross-env": "^7.0.3",
-    "fastify": "^4.26.1",
-    "fastify-plugin": "^4.0.0",
-    "maplibre-gl": "^4.7.0",
-    "moment": "^2.30.1",
-    "vite": "^5.1.4",
-    "vue": "^3.4.21",
-    "vue-router": "^4.3.0"
-  },
-  "devDependencies": {
-    "@panzoom/panzoom": "^4.5.1",
-    "@vue/eslint-config-typescript": "^12.0.0",
-    "eslint": "^8.49.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-vue": "^9.17.0",
-    "markdown-it-abbr": "^2.0.0",
-    "mermaid": "^10.9.0",
-    "sass-embedded": "^1.79.1",
-    "vitepress": "^1.1.3",
-    "vitepress-plugin-mermaid": "^2.0.16",
-    "vitepress-plugin-tabs": "^0.5.0",
-    "vitepress-sidebar": "^1.22.0"
-  }
-}
+{
+  "name": "@opengis/admin",
+  "version": "0.1.43",
+  "description": "This project Softpro Admin",
+  "main": "dist/admin.js",
+  "type": "module",
+  "directories": {
+    "test": "test"
+  },
+  "files": [
+    "dist/*",
+    "module/*",
+    "server/*",
+    "plugin.js",
+    "utils.js",
+    "config.js"
+  ],
+  "scripts": {
+    "test": "node --test test/**/*.test.js",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "build": "vite build",
+    "build-app": "cross-env APP=true vite build",
+    "admin": "cross-env NODE_ENV=admin npm run start",
+    "admin1": "cross-env NODE_ENV=admin1 npm run start",
+    "prod": "cross-env NODE_ENV=production npm run start",
+    "start": "node --watch-path=server server vite ",
+    "docs:dev": "vitepress dev docs",
+    "docs:build": "vitepress build docs",
+    "docs:preview": "vitepress preview docs"
+  },
+  "keywords": [],
+  "author": "Softpro",
+  "license": "ISC",
+  "dependencies": {
+    "@opengis/fastify-auth": "^1.0.35",
+    "@opengis/fastify-file": "^1.0.17",
+    "@opengis/fastify-table": "^1.1.27",
+    "@opengis/v3-core": "^0.1.105",
+    "@opengis/v3-filter": "^0.0.31",
+    "@tiptap/core": "^2.8.0",
+    "@tiptap/extension-color": "^2.8.0",
+    "@tiptap/extension-mention": "^2.8.0",
+    "@tiptap/extension-placeholder": "^2.8.0",
+    "@tiptap/extension-text": "^2.8.0",
+    "@tiptap/extension-text-style": "^2.8.0",
+    "@tiptap/extension-underline": "^2.8.0",
+    "@tiptap/pm": "^2.8.0",
+    "@tiptap/starter-kit": "^2.8.0",
+    "@tiptap/suggestion": "^2.8.0",
+    "@tiptap/vue-3": "^2.8.0",
+    "@turf/turf": "^7.1.0",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "close-with-grace": "^1.3.0",
+    "cross-env": "^7.0.3",
+    "fastify": "^4.26.1",
+    "fastify-plugin": "^4.0.0",
+    "maplibre-gl": "^4.7.0",
+    "moment": "^2.30.1",
+    "vite": "^5.1.4",
+    "vue": "^3.4.21",
+    "vue-router": "^4.3.0"
+  },
+  "devDependencies": {
+    "@panzoom/panzoom": "^4.5.1",
+    "@vue/eslint-config-typescript": "^12.0.0",
+    "eslint": "^8.49.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-vue": "^9.17.0",
+    "markdown-it-abbr": "^2.0.0",
+    "mermaid": "^10.9.0",
+    "sass-embedded": "^1.79.1",
+    "vitepress": "^1.1.3",
+    "vitepress-plugin-mermaid": "^2.0.16",
+    "vitepress-plugin-tabs": "^0.5.0",
+    "vitepress-sidebar": "^1.22.0"
+  }
+}

package/plugin.js

@@ -1,102 +1,102 @@
-import fp from 'fastify-plugin';
-import path from 'node:path';
-
-import { getTemplatePath, getTemplate, pgClients } from '@opengis/fastify-table/utils.js';
-
-import config from './config.js';
-import getMenu from './server/routes/menu/controllers/getMenu.js';
-
-config.prefix = config.prefix || '/api';
-
-async function plugin(fastify, opts = config) {
-  // const prefix = config.prefix || '/api';
-
-  // core
-
-
-  fastify.register(import('./server/helpers/index.mjs'), opts);
-  // fastify.register(import('@opengis/fastify-auth'), config);
-
-  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());
-    }
-  });
-
-
-  // API
-
-  fastify.register(import('./server/routes/properties/index.mjs'), opts);
-  fastify.register(import('./server/routes/templates/index.mjs'), opts);
-  fastify.register(import('./server/routes/menu/index.mjs'), opts);
-  fastify.register(import('./server/routes/data/index.mjs'), opts);
-
-}
+import fp from 'fastify-plugin';
+import path from 'node:path';
+
+import { getTemplatePath, getTemplate, pgClients } from '@opengis/fastify-table/utils.js';
+
+import config from './config.js';
+import getMenu from './server/routes/menu/controllers/getMenu.js';
+
+config.prefix = config.prefix || '/api';
+
+async function plugin(fastify, opts = config) {
+  // const prefix = config.prefix || '/api';
+
+  // core
+
+
+  fastify.register(import('./server/helpers/index.mjs'), opts);
+  // fastify.register(import('@opengis/fastify-auth'), config);
+
+  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());
+    }
+  });
+
+
+  // API
+
+  fastify.register(import('./server/routes/properties/index.mjs'), opts);
+  fastify.register(import('./server/routes/templates/index.mjs'), opts);
+  fastify.register(import('./server/routes/menu/index.mjs'), opts);
+  fastify.register(import('./server/routes/data/index.mjs'), opts);
+
+}
 export default fp(plugin)

package/server/helpers/controllers/badge.js

@@ -1,12 +1,12 @@
-export default async function badge(data, options = {}) {
-    if (!data) return '-';
-    //const cls = await getSelect(options.data, { val: data, full: 1 });
-
-    return data;
-    /*const html = cls?.map((el) => {
-        const color = bscolor[el.color] || el.color || '#aaa';
-        return `<span class="el-tag el-tag--mini" style="color:${color || '#aaa'};border-color:${color || '#aaa'};background:unset;">
-        ${funcs.locale(el.id, { lang: root.lang, prefix: opt.data, type: 'cls' }) || el.text}</span>`;
-    }).join(', ');
-    return html;*/
+export default async function badge(data, options = {}) {
+    if (!data) return '-';
+    //const cls = await getSelect(options.data, { val: data, full: 1 });
+
+    return data;
+    /*const html = cls?.map((el) => {
+        const color = bscolor[el.color] || el.color || '#aaa';
+        return `<span class="el-tag el-tag--mini" style="color:${color || '#aaa'};border-color:${color || '#aaa'};background:unset;">
+        ${funcs.locale(el.id, { lang: root.lang, prefix: opt.data, type: 'cls' }) || el.text}</span>`;
+    }).join(', ');
+    return html;*/
 }

package/server/helpers/controllers/hb.js

@@ -1,3 +1,3 @@
-export default async function _hb() {
-    return '';
+export default async function _hb() {
+    return '';
 }

package/server/helpers/controllers/map.js

@@ -1,3 +1,3 @@
-export default async function map() {
-    return '';
+export default async function map() {
+    return '';
 }

package/server/helpers/controllers/mls.js

@@ -1,3 +1,3 @@
-export default async function _mls(data, options={}) {
-    return data.hash?.ua || options?.hash?.ua || '';
+export default async function _mls(data, options={}) {
+    return data.hash?.ua || options?.hash?.ua || '';
 }