@opengis/fastify-table 1.3.52 → 1.3.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.52",
+  "version": "1.3.54",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -32,32 +32,33 @@
   },
   "dependencies": {
     "@fastify/http-proxy": "9.5.0",
-    "@fastify/sensible": "^5.0.0",
+    "@fastify/sensible": "5.0.0",
     "@fastify/url-data": "5.4.0",
-    "fastify": "^4.26.1",
-    "fastify-plugin": "^4.0.0",
+    "fastify": "4.26.1",
+    "fastify-plugin": "4.0.0",
+    "handlebars": "4.7.8",
     "ioredis": "5.3.2",
     "js-yaml": "4.1.0",
+    "markdown-it": "14.1.0",
     "pg": "8.11.3",
     "pino": "9.5.0",
     "pino-abstract-transport": "2.0.0",
-    "uglify-js": "3.19.3",
-    "handlebars": "^4.7.8",
-    "promised-handlebars": "^2.0.1",
-    "qrcode": "^1.5.4"
+    "promised-handlebars": "2.0.1",
+    "qrcode": "1.5.4",
+    "uglify-js": "3.19.3"
   },
   "devDependencies": {
-    "@panzoom/panzoom": "^4.5.1",
-    "eslint": "^8.49.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "markdown-it-abbr": "^2.0.0",
-    "mermaid": "^10.9.3",
+    "@panzoom/panzoom": "4.5.1",
+    "eslint": "8.49.0",
+    "eslint-config-airbnb": "19.0.4",
+    "markdown-it-abbr": "2.0.0",
+    "mermaid": "10.9.3",
     "sass": "1.72.0",
-    "vitepress": "^1.3.4",
-    "vitepress-plugin-mermaid": "^2.0.16",
-    "vitepress-plugin-tabs": "^0.5.0",
-    "vitepress-sidebar": "^1.25.0",
-    "vue": "^3.4.27"
+    "vitepress": "1.3.4",
+    "vitepress-plugin-mermaid": "2.0.16",
+    "vitepress-plugin-tabs": "0.5.0",
+    "vitepress-sidebar": "1.25.0",
+    "vue": "3.4.27"
   },
   "author": "Softpro",
   "license": "ISC"

package/server/migrations/template.sql

@@ -9,16 +9,21 @@ ALTER TABLE admin.templates DROP CONSTRAINT if exists admin_templates_name_type_
 ALTER TABLE admin.templates add column if not exists name text;
 ALTER TABLE admin.templates add column if not exists title text;
 ALTER TABLE admin.templates add column if not exists type text;
+ALTER TABLE admin.templates add column if not exists category text;
 ALTER TABLE admin.templates add column if not exists route_id text;
-ALTER TABLE admin.templates add column if not exists enabled boolean;
-ALTER TABLE admin.templates alter column enabled set default true;
+ALTER TABLE admin.templates add column if not exists is_active boolean;
+ALTER TABLE admin.templates alter column is_active   set default true;
 ALTER TABLE admin.templates add column if not exists body text;
+ALTER TABLE admin.templates add column if not exists description text;
+ALTER TABLE admin.templates add column if not exists placeholders json;
+ALTER TABLE admin.templates add column if not exists version numeric;
 
-ALTER TABLE admin.templates add column if not exists uid text;
-ALTER TABLE admin.templates add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE admin.templates alter column cdate set DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE admin.templates add column if not exists editor_id text;
-ALTER TABLE admin.templates add column if not exists editor_date timestamp without time zone;
+ALTER TABLE admin.templates add column if not exists created_by text;
+ALTER TABLE admin.templates add column if not exists created_at timestamp without time zone;
+ALTER TABLE admin.templates alter column created_at set DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE admin.templates add column if not exists updated_by text;
+ALTER TABLE admin.templates add column if not exists updated_at timestamp without time zone;
+ALTER TABLE admin.templates alter column updated_at set DEFAULT date_trunc('seconds'::text, now());
 
 ALTER TABLE admin.templates add CONSTRAINT admin_templates_template_id_pkey PRIMARY KEY (template_id);
 ALTER TABLE admin.templates add CONSTRAINT admin_templates_name_type_unique UNIQUE (name, type);
@@ -30,6 +35,10 @@ COMMENT ON COLUMN admin.templates.uid IS 'ID користувача';
 COMMENT ON COLUMN admin.templates.name IS 'Систамна назва шаблону';
 COMMENT ON COLUMN admin.templates.title IS 'Назва шаблону українською';
 COMMENT ON COLUMN admin.templates.type IS 'Тип вихідних даних шаблону (demo/user)';
+COMMENT ON COLUMN admin.templates.category IS 'Категорія або тип документа';
 COMMENT ON COLUMN admin.templates.route_id IS 'ID інтерфейсу';
-COMMENT ON COLUMN admin.templates.enabled IS 'On / Off';
-COMMENT ON COLUMN admin.templates.body IS 'Body HTML';
+COMMENT ON COLUMN admin.templates.is_active IS 'Чи доступний шаблон для використання';
+COMMENT ON COLUMN admin.templates.body IS 'Body HTML';
+COMMENT ON COLUMN admin.templates.description IS 'Короткий опис шаблону';
+COMMENT ON COLUMN admin.templates.placeholders IS 'Список змінних, які можна вставляти';
+COMMENT ON COLUMN admin.templates.version IS 'Версія шаблону';

package/server/plugins/md/funcs/formatMdoc.js

@@ -0,0 +1,40 @@
+function handleData(data, curr, acc, titles = {}, plain, splittype = 1) {
+
+    const titleStr = {
+        1: `${(titles?.[curr] || curr)}\n`, // for lists
+        2: `${(titles?.[curr] || curr)}: `, // one-liner
+        3: '' // for nested lists w/ one property
+    }[splittype];
+
+    if (Array.isArray(data[curr])) {
+        const str = `${plain ? '' : '\n\n### '}${titleStr}${data[curr].map(el => {
+            if (typeof el === 'object' && !Array.isArray(el)) {
+                const str = Object.keys(el).filter(el => el !== 'id').reduce((acc1, curr1) => handleData(el, curr1, acc1, {}, 1, 3), '');
+                return `\n - ${str}`;
+            }
+            return `\n - ${el}`;
+        })}`;
+        acc += `${str}`;
+        return acc;
+    } else if (typeof data[curr] === 'object') {
+        const str = `${plain ? '' : '\n\n### '} ${titleStr}${JSON.stringify(data[curr])}`;
+        acc += str;
+        return acc;
+    }
+
+    acc += `${plain ? '' : '\n\n### '}${titleStr}${data[curr] || ''}`;
+    return acc;
+}
+
+export default function formatMdoc(data, titles = {}, headerColumns = [], descriptionColumns = []) {
+    if (!data) return 'empty data';
+    if (typeof data !== 'object' || Array.isArray(data)) return 'invalid data';
+    if (headerColumns && !Array.isArray(headerColumns)) return 'invalid headerColumns';
+    if (descriptionColumns && !Array.isArray(descriptionColumns)) return 'invalid descriptionColumns';
+
+    const header = Object.keys(data).filter(key => headerColumns.includes(key) && data[key]).reduce((acc, curr) => handleData(data, curr, acc, titles, 1, 2), '');
+
+    const description = Object.keys(data).filter(key => descriptionColumns.includes(key) && data[key]).reduce((acc, curr) => handleData(data, curr, acc, titles), '');
+
+    return `---\n${header}\n---${description}`.replace(/,,/g, ',');
+};

package/server/plugins/md/funcs/mdToHTML.js

@@ -0,0 +1,17 @@
+import md from 'markdown-it';
+
+const md1 = md({ html: true });
+
+/**
+ * Перетворення з файла readme.md до формату HTML.
+ * Потрабно вставити в хелпер шлях до файла або текст readme.md і за допомогою бібліотеки markdown-it перетвориться в HTML.
+
+ * @returns {String} Returns HTML
+*/
+export default function mdToHTML(data, options) {
+  // auto detect HTML or MD
+  // const result = md().render(data);
+  if (!data) return 'empty data';
+  const result = md1.render(data);
+  return result;
+};

package/server/plugins/table/funcs/getTemplate.js

@@ -1,10 +1,11 @@
-import path from 'path';
+import path from 'node:path';
 import yaml from 'js-yaml';
 
-import { readdir, readFile } from 'fs/promises';
+import { readdir, readFile } from 'node:fs/promises';
 
 import getTemplatePath from './getTemplatePath.js';
 import loadTemplate from './loadTemplate.js';
+import mdToHTML from '../../md/funcs/mdToHTML.js';
 
 async function readFileData(file) {
   const data = await readFile(file, 'utf-8');
@@ -16,6 +17,21 @@ async function readFileData(file) {
   if (ext === 'json') {
     return JSON.parse(data);
   }
+  if (ext === 'md') {
+    const match = data.match(/^---\r?\n([\s\S]*?)---\r?\n([\s\S]*)$/);
+
+    const parseLinesRecursively = (lines, index = 0, result = {}) => index >= lines.length
+      ? result
+      : (([key, ...rest]) => key && rest.length
+        ? parseLinesRecursively(lines, index + 1, { ...result, [key.trim()]: rest.join(':').trim() })
+        : parseLinesRecursively(lines, index + 1, result))((lines[index] || '').split(':'));
+
+    const header = parseLinesRecursively(match[1]?.split?.(/\r?\n/) || []);
+    const body = match[2]?.replace(/\r\n/g, '')?.startsWith('```html') ? match[2]?.match?.(/```html\r?\n([\s\S]*?)```/)?.[1] : match[2];
+
+    return { ...header, html: mdToHTML(body) };
+
+  }
   return data;
 }
 

package/server/routes/table/controllers/data.js

@@ -155,7 +155,7 @@ export default async function dataAPI(req, reply, called) {
                      ${params.id || query.key ? '*' : sqlColumns || cols || '*'} 
                      ${metaCols} 
                      
-                     ${dbColumns.find((el) => el.name === 'geom' && pg.pgType?.[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : ''} 
+                     ${dbColumns.filter((el) => pg.pgType?.[el.dataTypeID] === 'geometry').length ? `,${dbColumns.filter((el) => pg.pgType?.[el.dataTypeID] === 'geometry').map(el => `st_asgeojson("${el.name.replace(/'/g, "''")}")::json as "${el.name.replace(/'/g, "''")}"`).join(',')}` : ''} 
                      from (select * ${sql?.filter(el => el.inline).map(el => `,(${el.sql})`).join('') || ''} from ${table} t  ${sqlTable} ) t 
                       
                      ${params.id ? cardSqlTable : ''} 
@@ -167,7 +167,10 @@ export default async function dataAPI(req, reply, called) {
   if (config.trace) console.log(q);
   if (query.sql === '1') { return q; }
 
-  const { rows = [] } = await pg.query(q, (tokenData?.id || hookData?.id || params.id ? [tokenData?.id || hookData?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
+  const { rows = [] } = await pg.query(q, (tokenData?.id || hookData?.id || params.id ? [tokenData?.id || hookData?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : [])).catch(err => {
+    console.error(err.toString());
+    throw new Error(err.toString());
+  });
 
   timeArr.push(Date.now())
 

package/server/routes/table/controllers/filter.js

@@ -36,7 +36,7 @@ export default async function filterAPI(req) {
 
   filters?.forEach?.(el => Object.assign(el, { id: el.id || el.name, title: el.title || el.ua, extra: extraColumns.includes(el.id || el.name) }));
 
-  await Promise.all(filters.filter((el) => el.data && el.id && el.type !== 'Autocomplete').map(async (el) => {
+  await Promise.all(filters.filter((el) => el.data && el.id && el.type !== 'Autocomplete' && !el.sql).map(async (el) => {
     const cls = await getSelect(el.data, pg);
 
     if (!cls || !loadTable.table) return;

package/utils.js

@@ -76,6 +76,9 @@ import logChanges from './server/plugins/crud/funcs/utils/logChanges.js';
 import yml2json from './server/plugins/yml/funcs/yml2json.js';
 import json2yml from './server/plugins/yml/funcs/json2yml.js';
 
+import formatMdoc from './server/plugins/md/funcs/formatMdoc.js';
+import mdToHTML from './server/plugins/md/funcs/mdToHTML.js';
+
 export default null;
 export {
   config,
@@ -146,4 +149,7 @@ export {
 
   yml2json,
   json2yml,
+
+  formatMdoc,
+  mdToHTML,
 };