@opengis/admin 0.2.25 → 0.2.26

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

@@ -1,68 +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"
-    }
-  ]
+{
+  "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

@@ -1,38 +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": "Дата створення"
-    }
-  ]
+{
+  "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,84 +1,84 @@
-{
-  "name": "@opengis/admin",
-  "version": "0.2.25",
-  "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",
-    "prod": "cross-env NODE_ENV=production npm run start",
-    "debug": "node --watch-path=server server",
-    "start": "node server",
-    "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs"
-  },
-  "keywords": [],
-  "author": "Softpro",
-  "license": "ISC",
-  "dependencies": {
-    "nodemailer": "^6.5.0",
-    "@fancyapps/ui": "^5.0.36",
-    "@opengis/admin": "^0.1.69",
-    "@opengis/fastify-auth": "^1.0.51",
-    "@opengis/fastify-file": "^1.0.30",
-    "@opengis/fastify-table": "^1.1.86",
-    "@opengis/v3-core": "^0.2.52",
-    "@opengis/v3-filter": "^0.0.41",
-    "@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",
-    "autoprefixer": "^10.4.20",
-    "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",
-    "postcss": "^8.4.47",
-    "sass-embedded": "^1.79.1",
-    "tailwindcss": "^3.4.13",
-    "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.2.26",
+  "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",
+    "prod": "cross-env NODE_ENV=production npm run start",
+    "debug": "node --watch-path=server server",
+    "start": "node server",
+    "docs:dev": "vitepress dev docs",
+    "docs:build": "vitepress build docs",
+    "docs:preview": "vitepress preview docs"
+  },
+  "keywords": [],
+  "author": "Softpro",
+  "license": "ISC",
+  "dependencies": {
+    "nodemailer": "^6.5.0",
+    "@fancyapps/ui": "^5.0.36",
+    "@opengis/admin": "^0.1.69",
+    "@opengis/fastify-auth": "^1.0.51",
+    "@opengis/fastify-file": "^1.0.30",
+    "@opengis/fastify-table": "^1.1.86",
+    "@opengis/v3-core": "^0.2.52",
+    "@opengis/v3-filter": "^0.0.41",
+    "@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",
+    "autoprefixer": "^10.4.20",
+    "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",
+    "postcss": "^8.4.47",
+    "sass-embedded": "^1.79.1",
+    "tailwindcss": "^3.4.13",
+    "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,30 +1,30 @@
-import fp from 'fastify-plugin';
-
-import config from './config.js';
-
-config.prefix = config.prefix || '/api';
-
-async function plugin(fastify, opts = config) {
-  // const prefix = config.prefix || '/api';
-
-  fastify.register(import('./server/helpers/index.js'), opts);
-  // fastify.register(import('@opengis/fastify-auth'), config);
-
-  fastify.register(import('./server/plugins/cron.js'), opts); // cron / scheduler
-  fastify.register(import('./server/plugins/hook.js'), opts); // data / template hooks
-  fastify.register(import('./server/plugins/access/index.mjs'), opts); // check access / analogue of policy
-
-  // API
-  fastify.register(import('./server/routes/properties/index.mjs'), opts);
-  fastify.register(import('./server/routes/calendar/index.mjs'), opts);
-  fastify.register(import('./server/routes/notifications/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);
-
-  fastify.register(import('./server/routes/user/index.mjs'), opts);
-  fastify.register(import('./server/routes/widget/index.mjs'), opts);
-
-  fastify.register(import('./server/routes/access/index.mjs'), opts);
-}
+import fp from 'fastify-plugin';
+
+import config from './config.js';
+
+config.prefix = config.prefix || '/api';
+
+async function plugin(fastify, opts = config) {
+  // const prefix = config.prefix || '/api';
+
+  fastify.register(import('./server/helpers/index.js'), opts);
+  // fastify.register(import('@opengis/fastify-auth'), config);
+
+  fastify.register(import('./server/plugins/cron.js'), opts); // cron / scheduler
+  fastify.register(import('./server/plugins/hook.js'), opts); // data / template hooks
+  fastify.register(import('./server/plugins/access/index.mjs'), opts); // check access / analogue of policy
+
+  // API
+  fastify.register(import('./server/routes/properties/index.mjs'), opts);
+  fastify.register(import('./server/routes/calendar/index.mjs'), opts);
+  fastify.register(import('./server/routes/notifications/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);
+
+  fastify.register(import('./server/routes/user/index.mjs'), opts);
+  fastify.register(import('./server/routes/widget/index.mjs'), opts);
+
+  fastify.register(import('./server/routes/access/index.mjs'), opts);
+}
 export default fp(plugin)

package/server/helpers/core/badge.js

@@ -1,16 +1,16 @@
-import { getSelect } from "@opengis/fastify-table/utils.js";
-
-
-
-export default async function badge(id, options) {
-  if (!id) return '-';
-  const data = options.hash?.data;
-  if (!data) return id;
-  const classifier = await getSelect(data);
-  if (!classifier?.arr) return id;
-
-  const item = classifier?.arr.find(el => el.id == id);
-  if (!item) return id;
-  return `<span style='color:${item.color || '#14b8a6'};border-color:${item.color || '#14b8a6'};' class="inline-flex items-center gap-x-1.5 py-1.5 px-3 rounded-full text-xs font-medium border border-teal-500 text-teal-500">${item.text}</span>`
-
-}
+import { getSelect } from "@opengis/fastify-table/utils.js";
+
+
+
+export default async function badge(id, options) {
+  if (!id) return '-';
+  const data = options.hash?.data;
+  if (!data) return id;
+  const classifier = await getSelect(data);
+  if (!classifier?.arr) return id;
+
+  const item = classifier?.arr.find(el => el.id == id);
+  if (!item) return id;
+  return `<span style='color:${item.color || '#14b8a6'};border-color:${item.color || '#14b8a6'};' class="inline-flex items-center gap-x-1.5 py-1.5 px-3 rounded-full text-xs font-medium border border-teal-500 text-teal-500">${item.text}</span>`
+
+}

package/server/helpers/core/buttonHelper.js

@@ -1,21 +1,21 @@
-import buttonAdd from "../utils/buttonAdd.js";
-import buttonDel from "../utils/buttonDel.js";
-import buttonEdit from "../utils/buttonEdit.js";
-import button from "../utils/button.js";
-export default function buttonHelper(data, opt) {
-  const { hash } = opt;
-
-  // console.log(params)
-
-  if (!hash.token) return "token empty";
-  if (hash.add) {
-    return buttonAdd(hash.token, hash.title);
-  }
-  if (hash.del) {
-    return buttonDel(hash.token, hash.title);
-  }
-  if (hash.edit) {
-    return buttonEdit(hash.token, hash.title);
-  }
-  return button(hash.token, hash.title);
-}
+import buttonAdd from "../utils/buttonAdd.js";
+import buttonDel from "../utils/buttonDel.js";
+import buttonEdit from "../utils/buttonEdit.js";
+import button from "../utils/button.js";
+export default function buttonHelper(data, opt) {
+  const { hash } = opt;
+
+  // console.log(params)
+
+  if (!hash.token) return "token empty";
+  if (hash.add) {
+    return buttonAdd(hash.token, hash.title);
+  }
+  if (hash.del) {
+    return buttonDel(hash.token, hash.title);
+  }
+  if (hash.edit) {
+    return buttonEdit(hash.token, hash.title);
+  }
+  return button(hash.token, hash.title);
+}

package/server/helpers/core/select.js

@@ -1,48 +1,48 @@
-import { getPG, getSelect } from "@opengis/fastify-table/utils.js";
-const pg = getPG();
-
-export default async function select(ids, options) {
-  if (!ids || (Array.isArray(ids) && ids.length === 0) || ids === '') {
-    return '';
-  }
-
-  const data = options.hash?.data;
-  if (!data && data !== false && data !== 0) return '';
-  try {
-    const idsArray = Array.isArray(ids) ? ids : [ids];
-
-    const classifier = await getSelect(data);
-
-
-
-    if (!classifier) return `Не знайдено класифікатор ${data}`;
-
-    const arr = classifier.arr || []
-    if (classifier.sql && typeof classifier.sql === 'string') {
-
-
-
-      const metaQuery = `SELECT * FROM (${classifier.sql})q LIMIT 0`;
-      const meta = await pg.query(metaQuery);
-      const idColumn = meta.fields[0].name;
-      const textColumn = meta.fields[1].name;
-
-      const sql = `SELECT "${idColumn}" AS id, "${textColumn}" AS text FROM (${classifier.sql}) q WHERE "${idColumn}" = ANY($1::text[])`;
-      const values = [idsArray.map(id => String(id))];
-
-      const { rows } = await pg.query(sql, values);
-      Object.assign(arr, rows)
-
-    }
-    if (!arr.length) return idsArray
-
-    const results = idsArray.map(id => {
-      const result = arr.find(el => String(el.id) == String(id));
-      return result ? result.text : '';
-    });
-
-    return results.filter(Boolean).join(', ');
-  } catch (error) {
-    return `Сталася помилка.<!-- err: ${error.toString()} -->`;
-  }
-}
+import { getPG, getSelect } from "@opengis/fastify-table/utils.js";
+const pg = getPG();
+
+export default async function select(ids, options) {
+  if (!ids || (Array.isArray(ids) && ids.length === 0) || ids === '') {
+    return '';
+  }
+
+  const data = options.hash?.data;
+  if (!data && data !== false && data !== 0) return '';
+  try {
+    const idsArray = Array.isArray(ids) ? ids : [ids];
+
+    const classifier = await getSelect(data);
+
+
+
+    if (!classifier) return `Не знайдено класифікатор ${data}`;
+
+    const arr = classifier.arr || []
+    if (classifier.sql && typeof classifier.sql === 'string') {
+
+
+
+      const metaQuery = `SELECT * FROM (${classifier.sql})q LIMIT 0`;
+      const meta = await pg.query(metaQuery);
+      const idColumn = meta.fields[0].name;
+      const textColumn = meta.fields[1].name;
+
+      const sql = `SELECT "${idColumn}" AS id, "${textColumn}" AS text FROM (${classifier.sql}) q WHERE "${idColumn}" = ANY($1::text[])`;
+      const values = [idsArray.map(id => String(id))];
+
+      const { rows } = await pg.query(sql, values);
+      Object.assign(arr, rows)
+
+    }
+    if (!arr.length) return idsArray
+
+    const results = idsArray.map(id => {
+      const result = arr.find(el => String(el.id) == String(id));
+      return result ? result.text : '';
+    });
+
+    return results.filter(Boolean).join(', ');
+  } catch (error) {
+    return `Сталася помилка.<!-- err: ${error.toString()} -->`;
+  }
+}

package/server/helpers/core/token.js

@@ -1,19 +1,19 @@
-import { setToken } from "@opengis/fastify-table/utils.js";
-
-export default function token(params) {
-
-    const { data, hash } = params;
-
-    if (!data?.root?.user?.uid && !hash.uid) return '-';
-    if (!hash || typeof hash !== 'object') return '-';
-
-    // const id = hash?.edit ? hash?.id : data?.root?.id;
-    // console.log(hash)
-    const [token] = setToken({
-        ids: [JSON.stringify(hash)],
-
-        uid: data?.root?.user?.uid || hash.uid,
-        array: 1,
-    });
-    return token;
+import { setToken } from "@opengis/fastify-table/utils.js";
+
+export default function token(params) {
+
+    const { data, hash } = params;
+
+    if (!data?.root?.user?.uid && !hash.uid) return '-';
+    if (!hash || typeof hash !== 'object') return '-';
+
+    // const id = hash?.edit ? hash?.id : data?.root?.id;
+    // console.log(hash)
+    const [token] = setToken({
+        ids: [JSON.stringify(hash)],
+
+        uid: data?.root?.user?.uid || hash.uid,
+        array: 1,
+    });
+    return token;
 }