@opengis/admin 0.2.81 → 0.2.83

package/module/settings/select/core.user_uid.sql

@@ -1 +1 @@
-select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users
+select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users

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

@@ -1,40 +1,40 @@
-{
-    "ua": "Налаштування",
-    "key": "property_id",
-    "form": "admin.properties.form",
-    "table": "admin.properties",
-    "order": "cdate desc",
-    "access": "admin",
-    "actions": [
-        "add",
-        "edit",
-        "del"
-    ],
-    "meta": {
-        "search": "property_key,property_text"
-    },
-    "columns": [
-        {
-            "name": "property_key",
-            "title": "Ключ",
-            "format": "text"
-        },
-        {
-            "name": "property_text",
-            "title": "Значення",
-            "format": "text"
-        }
-    ],
-    "filters": [
-        {
-            "ua": "Ключ",
-            "name": "property_key",
-            "type": "text"
-        },
-        {
-            "ua": "Значення",
-            "name": "property_text",
-            "type": "text"
-        }
-    ]
+{
+    "ua": "Налаштування",
+    "key": "property_id",
+    "form": "admin.properties.form",
+    "table": "admin.properties",
+    "order": "cdate desc",
+    "access": "admin",
+    "actions": [
+        "add",
+        "edit",
+        "del"
+    ],
+    "meta": {
+        "search": "property_key,property_text"
+    },
+    "columns": [
+        {
+            "name": "property_key",
+            "title": "Ключ",
+            "format": "text"
+        },
+        {
+            "name": "property_text",
+            "title": "Значення",
+            "format": "text"
+        }
+    ],
+    "filters": [
+        {
+            "ua": "Ключ",
+            "name": "property_key",
+            "type": "text"
+        },
+        {
+            "ua": "Значення",
+            "name": "property_text",
+            "type": "text"
+        }
+    ]
 }

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

@@ -0,0 +1,38 @@
+{
+  "table": "test.table_properties",
+  "key": "table_property_id",
+  "query": "1=1",
+  "form": "admin.table_properties.form",
+  "meta": {
+    "title": "table_name, table_id",
+    "search": "table_name, table_id"
+  },
+  "card": true,
+  "order": "cdate desc",
+  "actions": [
+    "add",
+    "edit",
+    "del"
+  ],
+  "sql": [
+
+  ],
+  "columns": [
+    {
+      "ua": "Назва",
+      "name": "title",
+      "format": "text"
+    },
+    {
+      "ua": "Таблиця в БД",
+      "name": "table_name",
+      "format": "text"
+    }
+  ],
+  "filterList": [
+
+  ],
+  "filterInline": [],
+  "filterState": [],
+  "filterCustom": []
+}

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

@@ -1,35 +1,35 @@
-{
-    "ua": "Налаштування користувача",
-    "key": "property_id",
-    "form": "admin.user_properties.form",
-    "table": "admin.user_properties",
-    "order": "cdate desc",
-    "access": "admin",
-    "actions": [
-        "add",
-        "edit",
-        "del"
-    ],
-    "meta": {
-        "search": "property_key"
-    },
-    "columns": [
-        {
-            "name": "property_key",
-            "title": "Ключ",
-            "format": "text"
-        },
-        {
-            "name": "property_json",
-            "title": "Значення",
-            "format": "text"
-        }
-    ],
-    "filters": [
-        {
-            "ua": "Ключ",
-            "name": "property_key",
-            "type": "text"
-        }
-    ]
+{
+    "ua": "Налаштування користувача",
+    "key": "property_id",
+    "form": "admin.user_properties.form",
+    "table": "admin.user_properties",
+    "order": "cdate desc",
+    "access": "admin",
+    "actions": [
+        "add",
+        "edit",
+        "del"
+    ],
+    "meta": {
+        "search": "property_key"
+    },
+    "columns": [
+        {
+            "name": "property_key",
+            "title": "Ключ",
+            "format": "text"
+        },
+        {
+            "name": "property_json",
+            "title": "Значення",
+            "format": "text"
+        }
+    ],
+    "filters": [
+        {
+            "ua": "Ключ",
+            "name": "property_key",
+            "type": "text"
+        }
+    ]
 }

package/module/settings/table/auth.logs.table.json

@@ -0,0 +1,98 @@
+{
+    "key": "change_id",
+    "ua": "Логи",
+    "table": "log.table_changes",
+    "order": "cdate desc",
+    "card": false,
+    "meta": {
+        "title": "change_id",
+        "search": "change_id,change_type,change_user_id,entity_type,entity_id,uid"
+    },
+    "sql": [
+        {
+            "sql": "select to_char(cdate ,'dd.mm.yyyy / hh:mi:ss') as cdate_format",
+            "name": "cdate_format_sql"
+        },
+        {
+            "sql": "select json_agg(json_build_object(entity_key,value_old)) as value_old, json_agg(json_build_object(entity_key,value_new)) as value_new from log.table_changes_data where change_id=t.change_id",
+            "name": "table_changes_data_sql"
+        }
+    ],
+    "columns": [
+        {
+            "ua": "Дата",
+            "name": "cdate_format",
+            "format": "text"
+        },
+        {
+            "ua": "Користувач",
+            "width": 300,
+            "name": "change_user_id",
+            "data": "admin.users",
+            "format": "select"
+        },
+        {
+            "ua": "Назва таблиці",
+            "name": "entity_type",
+            "format": "text"
+        },
+        {
+            "ua": "Дія",
+            "name": "change_type",
+            "format": "text"
+        },
+        {
+            "ua": "Колонки до",
+            "name": "value_old",
+            "width": 300,
+            "format": "slot",
+            "hidden": true,
+            "slot": {
+                "content": "{{JSON.stringify(data?.value_old)}}"
+            }
+        },
+        {
+            "ua": "Колонки після",
+            "name": "value_new",
+            "format": "slot",
+            "width": 300,
+            "hidden": true,
+            "slot": {
+                "content": "{{JSON.stringify(data?.value_new)}}"
+            }
+        },
+        {
+            "ua": "ID об'єкту",
+            "name": "entity_id",
+            "format": "text"
+        }
+    ],
+    "filter_list": [
+        {
+            "ua": "Користувач",
+            "data": "admin.users",
+            "name": "change_user_id",
+            "type": "Autocomplete"
+        },
+        {
+            "ua": "Дата",
+            "name": "cdate",
+            "type": "Datepicker"
+        },
+        {
+            "name": "entity_type",
+            "ua": "Назва таблиці",
+            "type": "Text"
+        },
+        {
+            "name": "e",
+            "ua": "ID об'єкту",
+            "type": "Text"
+        },
+        {
+            "ua": "Дія",
+            "name": "change_type",
+            "type": "Text "
+        }
+    ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.2.81",
+  "version": "0.2.83",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -46,12 +46,12 @@
     "@fullcalendar/list": "^6.1.15",
     "@fullcalendar/timegrid": "^6.1.15",
     "@fullcalendar/vue3": "^6.1.15",
-    "@opengis/admin": "^0.1.69",
+    "@opengis/admin": "^0.2.82",
     "@opengis/fastify-auth": "^1.0.61",
-    "@opengis/fastify-file": "^1.0.39",
-    "@opengis/fastify-table": "^1.1.143",
-    "@opengis/v3-core": "^0.3.29",
-    "@opengis/v3-filter": "^0.0.41",
+    "@opengis/fastify-file": "^1.0.40",
+    "@opengis/fastify-table": "^1.1.146",
+    "@opengis/v3-core": "^0.3.33",
+    "@opengis/v3-filter": "^0.0.62",
     "@tabler/icons-vue": "^3.28.1",
     "@tiptap/core": "^2.8.0",
     "@tiptap/extension-color": "^2.8.0",
@@ -79,6 +79,7 @@
     "vue-router": "^4.3.0"
   },
   "devDependencies": {
+    "@opengis/table-builder": "^1.1.1",
     "@panzoom/panzoom": "^4.5.1",
     "@vue/eslint-config-typescript": "^12.0.0",
     "autoprefixer": "^10.4.20",
@@ -96,4 +97,4 @@
     "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);
-
-  fastify.register(import('./server/routes/print/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);
+
+  fastify.register(import('./server/routes/print/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;
 }