@opengis/admin 0.1.97 → 0.1.98

package/package.json

@@ -1,82 +1,82 @@
-{
-  "name": "@opengis/admin",
-  "version": "0.1.97",
-  "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.40",
-    "@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.98",
+  "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.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.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.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

@@ -0,0 +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>`
+
+}

package/server/helpers/core/buttonHelper.js

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

package/server/helpers/core/select.js

@@ -0,0 +1,50 @@
+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}`;
+
+    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);
+      classifier.arr = rows;
+
+    }
+
+    if (!Array.isArray(classifier?.arr) || !classifier.arr.length || !classifier.arr.every(item => typeof item === 'object' && item !== null)) {
+      return ids;
+    }
+
+    const results = idsArray.map(id => {
+      const result = classifier.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/{controllers → core}/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 { 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/index.js

@@ -0,0 +1,28 @@
+
+import { handlebars, handlebarsSync } from "@opengis/fastify-table/utils.js";
+
+import token from "./core/token.js";
+import descriptionList from "./list/descriptionList.js";
+import tableList from "./list/tableList.js";
+import buttonHelper from "./core/buttonHelper.js";
+import select from "./core/select.js";
+import badge from "./core/badge.js";
+
+
+import ifCond from "./temp/ifCond.js";
+import contentList from "./temp/contentList.js";
+
+
+
+export default async function route() {
+
+    handlebars.registerHelper('token', token);
+    handlebars.registerHelper('descriptionList', descriptionList);
+    handlebars.registerHelper('tableList', tableList);
+    handlebars.registerHelper('button', buttonHelper);
+    handlebars.registerHelper('select', select);
+    handlebars.registerHelper('badge', badge);
+    handlebars.registerHelper('contentList', contentList);
+    handlebarsSync.registerHelper('ifCond', ifCond);
+    handlebars.registerHelper('ifCond', ifCond);
+}

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,35 +1,44 @@
-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>';
+import { handlebarsSync, handlebars } 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 async function descriptionList(data, opt) {
+    const { hash } = opt;
+
+    // no data
+    if (hash.nodata && !data) {
+        const noDataText = typeof hash.nodata == 'string' ? hash.nodata : 'no data';
+        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());
+
+    const result = [];
+
+    for (let i = 0; i < keys.length; i += 2) {
+        const name = keys[i];
+        const nameHBS = name.includes('{{') ? handlebarsSync.compile(name)({ ...data, hash }) : false
+
+        if (!nameHBS && name.includes('{{')) continue;
+
+        const key = keys[i + 1];
+        const d1 = ['{{format', '{{select', '{{badge', '{{ifCond'].filter(el => key.includes(el)).length ? await handlebars.compile(key)(data) || '-' : null
+
+        result.push(`<div class="flex py-[16px] text-[14px] border-b border-[#E5E7EB">
+            <div class="text-[#6B7280] font-[400] w-[50%]">${nameHBS || name}</div>
+            <div class="font-[600] text-black w-[50%]">${d1 || format(data[key], key, data)}</div>
+            </div>
+            `);
+
+    }
+    return '<div class="w-full">' + result.join('') + '</div>';
 }

package/server/helpers/list/tableList.js

@@ -1,66 +1,79 @@
-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>';
+import { handlebarsSync, setToken, handlebars } from '@opengis/fastify-table/utils.js'
+
+import button from '../utils/button.js';
+import buttonDel from '../utils/buttonDel.js';
+
+function format(d, key, data) {
+    if (!key?.includes) return '';
+    if (d === true) return 'так';
+    if (d === false) return 'ні';
+    if (key === 'actions') {
+        return button(d, 'редагувати') + buttonDel(d)
+    }
+    if (key.includes('{{')) {
+        return handlebarsSync.compile(key)(data);
+    }
+    if (!d) return '-';
+    return d;
+}
+export default async function tableList(data, opt) {
+    const { hash } = opt;
+    // no data
+
+    if (hash.nodata && !data?.length) {
+        const noDataText = typeof hash.nodata == 'string' ? hash.nodata : 'no data';
+        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 result = [];
+    result.push('<thead> <tr>');
+
+    // thead 
+    const skip = {}
+    for (let i = 0; i < keys.length; i += 2) {
+        const name = keys[i];
+
+        // check hbs 
+        const nameHBS = name.includes('{{') ? handlebarsSync.compile(name)({ ...data, hash }) : false;
+        // console.log(name, data, nameHBS)
+        skip[name] = name.includes('{{') && !nameHBS;
+        if (skip[name]) continue;
+
+        result.push(`<th scope="col">
+                <div class="px-[20px] py-[12px] text-start text-nowrap font-medium text-[14px] text-[#6B7280] ">
+                    ${nameHBS || name}
+                </div>
+        </th>`)
+    }
+    result.push('</tr></thead>');
+
+    // body 
+    for (let k = 0; k < data.length; k += 2) {
+        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] }
+        const token = hash.table ? setToken({ ids: [JSON.stringify(obj)], uid: hash.uid, array: 1 })[0] : null;
+        for (let i = 0; i < keys.length; i += 2) {
+
+            const name = keys[i];
+            const key = keys[i + 1];
+
+            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>
+                            </td>`);
+
+        }
+        // action token 
+
+        result.push('</tr></tbody>');
+    }
+
+
+    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>`;
 }