@opengis/admin 0.1.86 → 0.1.88

package/package.json

@@ -1,82 +1,82 @@
-{
-  "name": "@opengis/admin",
-  "version": "0.1.86",
-  "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",
-    "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": {
-    "@fancyapps/ui": "^5.0.36",
-    "@opengis/admin": "^0.1.69",
-    "@opengis/fastify-auth": "^1.0.47",
-    "@opengis/fastify-file": "^1.0.27",
-    "@opengis/fastify-table": "^1.1.71",
-    "@opengis/v3-core": "^0.2.36",
-    "@opengis/v3-filter": "^0.0.39",
-    "@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.1.88",
+  "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",
+    "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": {
+    "@fancyapps/ui": "^5.0.36",
+    "@opengis/admin": "^0.1.69",
+    "@opengis/fastify-auth": "^1.0.47",
+    "@opengis/fastify-file": "^1.0.27",
+    "@opengis/fastify-table": "^1.1.71",
+    "@opengis/v3-core": "^0.2.41",
+    "@opengis/v3-filter": "^0.0.39",
+    "@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.mjs'), 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.mjs'), 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/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 || '';
 }

package/server/helpers/controllers/token.js

@@ -1,17 +1,17 @@
-import { config, setToken } from "@opengis/fastify-table/utils.js";
-
-export default function token(params) {
-    const { data, hash } = params;
-    if (!data?.root?.user?.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,
-        array: 1,
-    });
-    return token;
+import { config, setToken } from "@opengis/fastify-table/utils.js";
+
+export default function token(params) {
+    const { data, hash } = params;
+    if (!data?.root?.user?.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,
+        array: 1,
+    });
+    return token;
 }

package/server/helpers/controllers/vue.js

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

package/server/helpers/index.mjs

@@ -1,29 +1,29 @@
-import _hb from "./controllers/hb.js";
-import _vue from "./controllers/vue.js";
-import map from "./controllers/map.js";
-import _mls from "./controllers/mls.js";
-import badge from "./controllers/badge.js";
-import token from "./controllers/token.js";
-
-// list
-
-import descriptionList from "./list/descriptionList.js";
-import tableList from "./list/tableList.js";
-import buttonHelper from "./list/buttonHelper.js";
-
-import { handlebars } from "@opengis/fastify-table/utils.js";
-
-export default async function route(fastify) {
-    handlebars.registerHelper('_hb', _hb);
-    handlebars.registerHelper('_vue', _vue);
-    handlebars.registerHelper('map', map);
-    handlebars.registerHelper('mls', _mls);
-    handlebars.registerHelper('badge', badge);
-    handlebars.registerHelper('token', token);
-
-
-    // list
-    handlebars.registerHelper('descriptionList', descriptionList);
-    handlebars.registerHelper('tableList', tableList);
-    handlebars.registerHelper('button', buttonHelper);
-}
+import _hb from "./controllers/hb.js";
+import _vue from "./controllers/vue.js";
+import map from "./controllers/map.js";
+import _mls from "./controllers/mls.js";
+import badge from "./controllers/badge.js";
+import token from "./controllers/token.js";
+
+// list
+
+import descriptionList from "./list/descriptionList.js";
+import tableList from "./list/tableList.js";
+import buttonHelper from "./list/buttonHelper.js";
+
+import { handlebars } from "@opengis/fastify-table/utils.js";
+
+export default async function route(fastify) {
+    handlebars.registerHelper('_hb', _hb);
+    handlebars.registerHelper('_vue', _vue);
+    handlebars.registerHelper('map', map);
+    handlebars.registerHelper('mls', _mls);
+    handlebars.registerHelper('badge', badge);
+    handlebars.registerHelper('token', token);
+
+
+    // list
+    handlebars.registerHelper('descriptionList', descriptionList);
+    handlebars.registerHelper('tableList', tableList);
+    handlebars.registerHelper('button', buttonHelper);
+}

package/server/helpers/list/buttonHelper.js

@@ -1,11 +1,11 @@
-
-import button from './utils/button.js';
-export default function buttonHelper(data, opt) {
-    const { hash } = opt;
-
-    // console.log(params)
-
-    if (!hash.token) return 'token empty';
-
-    return button(hash.token, hash.title);
+
+import button from './utils/button.js';
+export default function buttonHelper(data, opt) {
+    const { hash } = opt;
+
+    // console.log(params)
+
+    if (!hash.token) return 'token empty';
+
+    return button(hash.token, hash.title);
 }

package/server/helpers/list/descriptionList.js

@@ -1,34 +1,35 @@
-import { handlebarsSync } from '@opengis/fastify-table/utils.js'
-
-function format(d, key, data) {
-    if (!key?.includes) return '';
-    if (d === true) return 'так';
-    if (d === false) return 'ні'
-    if (key.includes('<')) {
-        return handlebarsSync.compile(key)(data);
-    }
-    if (!d) return '-';
-    return d;
-}
-export default function descriptionList(data, opt) {
-    const { hash } = opt;
-
-    // console.log(params)
-
-    if (!hash.columns) return 'columns empty'
-    const keys = hash.columns.replace(/\./g, ',').split(',').map(el => el.trim())
-    const result = [];
-
-    for (let i = 0; i < keys.length; i += 2) {
-        const name = keys[i];
-        const key = keys[i + 1];
-
-        result.push(`<tr class="bg-white even:bg-gray-50">
-            <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase max-w-44">${name}</th>
-            <td class="px-6 py-2 text-sm text-gray-900 max-w-44 font-semibold">${format(data[key], key, data)}</td>
-            </tr>
-            `);
-
-    }
-    return '<table class="min-w-full divide-y divide-gray-200">' + result.join('') + '</table>';
+import { handlebarsSync } from '@opengis/fastify-table/utils.js'
+
+function format(d, key, data) {
+    if (!key?.includes) return '';
+    if (d === true) return 'так';
+    if (d === false) return 'ні'
+    if (key.includes('{{')) {
+        return handlebarsSync.compile(key)(data);
+    }
+    if (!d) return '-';
+    return d;
+}
+export default function descriptionList(data, opt) {
+    const { hash } = opt;
+
+    // console.log(params)
+
+    if (!hash.columns) return 'columns empty'
+    const keys = hash.columns.split(',').map(el => el.trim().replace(new RegExp(hash.comma || '#', 'g'), ','));
+
+    const result = [];
+
+    for (let i = 0; i < keys.length; i += 2) {
+        const name = keys[i];
+        const key = keys[i + 1];
+
+        result.push(`<tr class="bg-white even:bg-gray-50">
+            <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase max-w-44">${name}</th>
+            <td class="px-6 py-2 text-sm text-gray-900 max-w-44 font-semibold">${format(data[key], key, data)}</td>
+            </tr>
+            `);
+
+    }
+    return '<table class="min-w-full divide-y divide-gray-200">' + result.join('') + '</table>';
 }

package/server/helpers/list/tableList.js

@@ -1,66 +1,66 @@
-import { handlebarsSync, setToken } from '@opengis/fastify-table/utils.js'
-
-import button from './utils/button.js';
-
-function format(d, key, data) {
-    if (!key?.includes) return '';
-    if (d === true) return 'так';
-    if (d === false) return 'ні';
-    if (key === 'actions') {
-        return button(d, 'Редагувати')
-    }
-    if (key.includes('<')) {
-        return handlebarsSync.compile(key)(data);
-    }
-    if (!d) return '-';
-    return d;
-}
-export default function tableList(data, opt) {
-    const { hash } = opt;
-
-    if (!hash.columns) return 'columns empty'
-    const keys = hash.columns.replace(/\./g, ',').split(',').map(el => el.trim()).concat(hash.uid && hash.table && hash.form ? ['Дії', 'actions'] : []);
-
-    const result = [];
-    result.push('<thead> <tr class="border-t border-gray-200 divide-x divide-gray-200">');
-
-    // thead 
-    for (let i = 0; i < keys.length; i += 2) {
-        const name = keys[i];
-
-        result.push(`<th scope="col">
-            <div class="hs-dropdown relative inline-flex w-full ">
-                <div
-                    class="px-5 py-2.5 text-start w-full flex items-center gap-x-1 text-sm text-nowrap font-normal text-gray-500 ">
-                    ${name}
-                </div>
-            </div>
-        </th>`)
-    }
-    result.push('</tr></thead>');
-
-    // body 
-    for (let k = 0; k < data.length; k += 2) {
-        const row = data[k];
-        result.push('<tr class="divide-x divide-gray-200">');
-        for (let i = 0; i < keys.length; i += 2) {
-            const key = keys[i + 1];
-            const obj = { form: hash.form, table: hash.table, id: row[hash.id] }
-
-            const token = key == 'actions' ? setToken({ ids: [JSON.stringify(obj)], uid: hash.uid, array: 1 })[0] : null;
-
-            result.push(`<td class="size-px">
-                                <div class="px-5 py-2">
-                                    <p class="text-sm font-semibold text-gray-800">${format(token || row[key], key, data)}</p>
-                                </div>
-                            </td>`);
-
-        }
-        // action token 
-
-        result.push('</tr>');
-    }
-
-
-    return '<table class="min-w-full divide-y divide-gray-200"> ' + result.join('') + '</table>';
+import { handlebarsSync, setToken } from '@opengis/fastify-table/utils.js'
+
+import button from './utils/button.js';
+
+function format(d, key, data) {
+    if (!key?.includes) return '';
+    if (d === true) return 'так';
+    if (d === false) return 'ні';
+    if (key === 'actions') {
+        return button(d, 'Редагувати')
+    }
+    if (key.includes('{{')) {
+        return handlebarsSync.compile(key)(data);
+    }
+    if (!d) return '-';
+    return d;
+}
+export default function tableList(data, opt) {
+    const { hash } = opt;
+
+    if (!hash.columns) return 'columns empty'
+    const keys = hash.columns.split(',').map(el => el.trim().replace(new RegExp(hash.comma || '#', 'g'), ',')).concat(hash.uid && hash.table && hash.form ? ['Дії', 'actions'] : []);
+
+    const result = [];
+    result.push('<thead> <tr class="border-t border-gray-200 divide-x divide-gray-200">');
+
+    // thead 
+    for (let i = 0; i < keys.length; i += 2) {
+        const name = keys[i];
+
+        result.push(`<th scope="col">
+            <div class="hs-dropdown relative inline-flex w-full ">
+                <div
+                    class="px-5 py-2.5 text-start w-full flex items-center gap-x-1 text-sm text-nowrap font-normal text-gray-500 ">
+                    ${name}
+                </div>
+            </div>
+        </th>`)
+    }
+    result.push('</tr></thead>');
+
+    // body 
+    for (let k = 0; k < data.length; k += 2) {
+        const row = data[k];
+        result.push('<tr class="divide-x divide-gray-200">');
+        for (let i = 0; i < keys.length; i += 2) {
+            const key = keys[i + 1];
+            const obj = { form: hash.form, table: hash.table, id: row[hash.id] }
+
+            const token = key == 'actions' ? setToken({ ids: [JSON.stringify(obj)], uid: hash.uid, array: 1 })[0] : null;
+
+            result.push(`<td class="size-px">
+                                <div class="px-5 py-2">
+                                    <p class="text-sm font-semibold text-gray-800">${format(token || row[key], key, data)}</p>
+                                </div>
+                            </td>`);
+
+        }
+        // action token 
+
+        result.push('</tr>');
+    }
+
+
+    return '<table class="min-w-full divide-y divide-gray-200"> ' + result.join('') + '</table>';
 }

package/server/helpers/list/utils/button.js

@@ -1,6 +1,6 @@
-
-
-export default function button(token, title) {
-    return `<button onclick="window.v3plugin.$form({ token: '${token}' })"
-    class="inline-flex items-center px-2 py-1 text-sm font-medium text-white duration-300 bg-blue-600 border border-transparent rounded-lg gap-x-2 hover:bg-blue-700 hover:text-white">${title || 'Додати'}</button>`;
+
+
+export default function button(token, title) {
+    return `<button onclick="window.v3plugin.$form({ token: '${token}' })"
+    class="inline-flex items-center px-2 py-1 text-sm font-medium text-white duration-300 bg-blue-600 border border-transparent rounded-lg gap-x-2 hover:bg-blue-700 hover:text-white">${title || 'Додати'}</button>`;
 }

package/server/plugins/access/funcs/getAdminAccess.js

@@ -1,15 +1,15 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-export default async function getAdminAccess({
-    id, user = {},
-}) {
-    if (!id) {
-        return { message: 'not enough params: id', status: 400 };
-    }
-
-    if (config?.auth?.disable) return;
-
-    if (!config?.local && user?.user_type?.includes('admin')) {
-        return { message: 'access restricted: admin', status: 403 };
-    }
+import { config } from '@opengis/fastify-table/utils.js';
+
+export default async function getAdminAccess({
+    id, user = {},
+}) {
+    if (!id) {
+        return { message: 'not enough params: id', status: 400 };
+    }
+
+    if (config?.auth?.disable) return;
+
+    if (!config?.local && user?.user_type?.includes('admin')) {
+        return { message: 'access restricted: admin', status: 403 };
+    }
 }