@opengis/admin 0.2.131 → 0.2.133

package/server/routes/data/controllers/utils/conditions.js

@@ -1,21 +1,21 @@
-function onCheck(rule, data) {
-    const val = data[rule[0]];
-    // console.log(val, rule[1], rule[2])
-    if (rule[1] === '==') return val === rule[2];
-    if (rule[1] === '!=') return val !== rule[2];
-    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
-    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
-
-    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
-    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
-
-    if (rule[1] === '>') return val > rule[2];
-    if (rule[1] === '<') return val < rule[2];
-}
-export default function conditions(rules, data) {
-    if (!rules?.length) return true;
-    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
-    // console.log(rules, result)
-    return result;
-
+function onCheck(rule, data) {
+    const val = data[rule[0]];
+    // console.log(val, rule[1], rule[2])
+    if (rule[1] === '==') return val === rule[2];
+    if (rule[1] === '!=') return val !== rule[2];
+    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
+    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
+
+    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
+    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
+
+    if (rule[1] === '>') return val > rule[2];
+    if (rule[1] === '<') return val < rule[2];
+}
+export default function conditions(rules, data) {
+    if (!rules?.length) return true;
+    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
+    // console.log(rules, result)
+    return result;
+
 }

package/server/routes/menu/controllers/getMenu.js

@@ -1,6 +1,6 @@
 
 import { join } from 'path';
-import { userTemplateDir, config, pgClients } from '@opengis/fastify-table/utils.js';
+import { userTemplateDir, pgClients, applyHook, config } from '@opengis/fastify-table/utils.js';
 
 import { existsSync, readdirSync, readFileSync } from 'fs';
 const menuCache = [];
@@ -30,11 +30,17 @@ async function readMenu() {
     return menus;
 }
 export default async function adminMenu({ user = {}, session, pg = pgClients.client }) {
+    const time = Date.now();
     if (!user.uid) return { status: 403, message: 'access restricted' }
 
     const menus = isProduction && menuCache.length ? menuCache : await readMenu();
 
+    const { rows } = await pgClients.client.query(`select property_key as key,property_text as val from admin.properties where property_key~'^(${config.settingKeys || 'site|map|admin'})'`);
+    const settings = rows.reduce((p, { key, val }) => { const [k1, k2] = key.split('.'); p[k1] = p[k1] || {}; p[k1][k2] = val; return p }, {});
     // update user access
+    const { user_name, sur_name, father_name, email, phone, uid } = user;
+    const result = { settings, user: { uid, user_name, sur_name, father_name, email, phone } };
+    await applyHook('userMenu', result);
 
     if (session && user?.uid && !user.user_type?.includes?.('admin') && !user.type?.includes?.('admin') && pg.pk['admin.role_access']) {
         const { type, gl = [], routes = [] } = await pg.query(`select user_type as type, b.gl,routes from admin.users a
@@ -54,13 +60,15 @@ export default async function adminMenu({ user = {}, session, pg = pgClients.cli
         session?.set?.('passport', { user });
         if (type === 'admin') return menus;
         const userMenus = menus.map(el => (el.menu ? { ...el, menu: el.menu.filter(item => routes?.includes(item.path)) } : el))
-        return userMenus.filter(el => el.menu?.length || routes?.includes(el.path));
+        const menus = userMenus.filter(el => el.menu?.length || routes?.includes(el.path));
+        return { time: Date.now() - time, menus, ...result }
         // .filter((el, idx, arr) => arr.map((el) => el?.ua || el?.en || el?.name).indexOf(el?.ua || el?.en || el?.name) === idx)
     }
 
     // skip dupes?
     // .filter((el, idx, arr) => arr.map((el) => el?.ua || el?.en || el?.name).indexOf(el?.ua || el?.en || el?.name) === idx)
-    return menus;
+
+    return { time: Date.now() - time, menus, ...result };
 
 
 }

package/server/routes/menu/controllers/interfaces.js

@@ -0,0 +1,19 @@
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function adminMenu({ pg = pgClients.client }) {
+    const { rows = [] } = await pg.query(`select route_id, alias, table_name, title, enabled from admin.routes`);
+
+    const interfaces = rows
+        .filter((el, idx, arr) => el.table_name && arr.findIndex(item => item.route_id === el.route_id) === idx)
+        .filter(el => pg.pk?.[el.table_name || ''])
+        .filter(el => !['log.', 'admin.', 'setting.'].find(item => el.table_name.startsWith(item) ))
+        .map(el => ({
+            title: el.title,
+            alias: el.alias,
+            table: el.table_name,
+            route: el.route_id,
+            enabled: el.enabled,
+        }));
+
+    return interfaces;
+}

package/server/routes/menu/index.mjs

@@ -1,5 +1,7 @@
 import getMenu from './controllers/getMenu.js';
+import interfaces from './controllers/interfaces.js';
 
 export default async function (fastify, opts) {
   fastify.get(`/user-menu`, getMenu);
+  fastify.get(`/interfaces`, { config: { policy: ['admin'] } }, interfaces);
 }

package/server/routes/print/controllers/printTemplate.js

@@ -48,13 +48,14 @@ export default async function printTemplate(req, reply) {
     const loadTable = await getTemplate('table', table);
     const { optimizedSQL } = await getFilterSQL({ table, pg });
 
-    const where = `${loadTable?.key || pg.pk?.[loadTable?.table || table]}=$1`;
+    const where = `${loadTable?.key || pg.pk?.[loadTable?.table || table]}=any($1::text[])`;
 
     const q = `select * from (${optimizedSQL})q where ${loadTable?.query || '1=1'} and ${where}`;
 
-    const obj = await pg.query(q, [params.id]).then(el => el.rows?.[0] || {});
+    const { rows = [] } = await pg.query(q, [params.id.split(',')]);
 
-    const html = await handlebars.compile(body)(obj);
+    const htmls = await Promise.all(rows.map(async (row) => handlebars.compile(body)(row)));
+    const html = htmls.join('<p style="page-break-after: always;">&nbsp;</p>');
 
     if (format == 'html') {
         return reply.headers(headers).send(html);

package/server/routes/print/controllers/printTemplatePreview.js

@@ -1,6 +1,6 @@
 import { createHash } from 'node:crypto';
 
-import { config, getFilterSQL, getTemplate, handlebars, pgClients } from '@opengis/fastify-table/utils.js';
+import { config, getFilterSQL, getTemplate, handlebars, pgClients, getMeta } from '@opengis/fastify-table/utils.js';
 import { grpc } from '@opengis/fastify-file/utils.js';
 
 const { htmlToPdf } = grpc();
@@ -50,17 +50,21 @@ export default async function printTemplate(req, reply) {
         return reply.headers(headers).send(buffer);
     }
 
+    const { alias, table } = await pg.query(`select alias, table_name as table from admin.routes where route_id=$1`, [route])
+        .then(el => el.rows?.[0] || {});
+
+    if (!alias || !table) {
+        return reply.status(404).send('route table not found');
+    }
+
     if (query?.demo) {
-        const table = await pg.query(`select alias from admin.routes where route_id=$1`, [route])
-            .then(el => el.rows?.[0]?.alias);
+        const loadTable = await getTemplate('table', alias);
+        const { optimizedSQL } = await getFilterSQL({ pg, table: alias });
 
-        if (!table) {
-            return reply.status(404).send('route table not found');
+        if (!optimizedSQL) {
+            return reply.status(400).send('empty query');
         }
 
-        const loadTable = await getTemplate('table', table);
-        const { optimizedSQL } = await getFilterSQL({ table, pg });
-
         const q = `select * from (${optimizedSQL})q where ${loadTable?.query || '1=1'} limit 1`;
 
         const obj = await pg.query(q).then(el => el.rows?.[0] || {});
@@ -76,6 +80,8 @@ export default async function printTemplate(req, reply) {
         return reply.headers(headers).send(buffer);
     }
 
+    const meta = await getMeta({ pg, table });
+    const columns = meta.columns?.map(el => ({ name: el.name, title: el.title, type: pg.pgType[el.dataTypeID] || 'text' }));
     // for body edit
-    return { name, title, html: body, route };
+    return { name, title, html: body, route, alias, table, columns };
 }

package/server/routes/properties/controllers/admin.properties.get.js

@@ -1,13 +1,11 @@
 const table = 'admin.properties';
 
-import { config, getRedis, pgClients, getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
+import { pgClients, getTemplatePath, getTemplate } from '@opengis/fastify-table/utils.js';
 
-import { getSettings } from '../../../../utils.js';
 
-const redis = getRedis();
 
 export default async function getSettingsApp({
-  pg = pgClients.client, params = {}, query = {},
+  pg = pgClients.client,
 }) {
   const time = Date.now();
   if (!pg.pk?.[table]) {
@@ -21,13 +19,13 @@ export default async function getSettingsApp({
     return JSON.parse(cache);
   }*/
 
-  const settings = await getSettings({
-    pg, key: params.key, json: query.json, redis, table,
-  });
+  const { rows } = await pgClients.client.query("select property_key as key,property_text as val from admin.properties /*where property_key~'^(site|map)'*/");
+  const settings = rows.reduce((p, { key, val }) => { const [k1, k2] = key.split('.'); p[k1] = p[k1] || {}; p[k1][k2] = val; return p }, {});
+  const settings1 = rows.reduce((p, { key, val }) => ({ ...p, [key]: val }), {});
 
   const forms = await Promise.all(getTemplatePath('setting')
     .map(async (el) => ({ name: el[0], body: await getTemplate('setting', el[0]) }))
   );
 
-  return { message: { time: Date.now() - time, forms, settings }, status: 200 };
+  return { message: { time: Date.now() - time, forms, settings: settings1 }, status: 200 };
 }

package/server/routes/properties/controllers/admin.properties.post.js

@@ -1,9 +1,21 @@
 const table = 'admin.properties';
 
-import { setSettings } from '../../../../utils.js';
+import { dataInsert } from '@opengis/fastify-table/utils.js';
+
+function checkValueType(val) {
+  if (val) {
+    if (typeof val === 'object') {
+      return 'property_json';
+    }
+    if (typeof val === 'number' && (!/\D/.test(val.toString()) && val.toString().length < 10)) {
+      return 'property_int';
+    }
+  }
+  return 'property_text';
+}
 
 export default async function postSettingsApp({
-  pg, user = {}, body = {},
+  pg, user = {}, body = {}, uid
 }) {
   if (!user?.user_type?.includes?.('admin')) {
     return { message: 'access restricted', status: 403 };
@@ -16,11 +28,20 @@ export default async function postSettingsApp({
   if (!pg?.pk?.[table]) {
     return { message: 'table not found', status: 404 };
   }
+  const keys = Object.keys(body);
+  await pg.query(`delete from ${table} where property_key=any($1)`, [keys]);
+
+  await Promise.all(keys.map(async (el) => {
+    const columnType = table === 'admin.user_properties' ? 'property_json' : checkValueType(body[el]);
+    const data = { property_key: el, [columnType]: body[el], uid };
+    if (!body[el]) return;
+    await dataInsert({
+      pg, table, data, uid,
+    });
+
+  }));
+
 
-  const res = await setSettings({
-    pg, key, val, body,
-  });
-  if (res?.error) return res;
 
-  return { message: res, status: 200 };
+  return { message: 'ok', status: 200 };
 }

package/server/routes/properties/controllers/user.properties.get.js

@@ -1,11 +1,8 @@
 const table = 'admin.user_properties';
 
-import { getRedis } from '@opengis/fastify-table/utils.js';
-
-import { getSettings } from '../../../../utils.js';
 
 export default async function getSettingsUser({
-  pg = {}, params = {}, query = {}, session = {},
+  pg = {}, session = {},
 }) {
   const { uid } = session.passport?.user || {};
   if (!uid) {
@@ -16,15 +13,7 @@ export default async function getSettingsUser({
     return { message: 'table not found', status: 404 };
   }
 
-  const redis = getRedis();
-  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:user`;
-
-  const cache = await redis.get(keyCache);
-  if (cache) return JSON.parse(cache);
 
-  const res = await getSettings({
-    pg, key: params.key, json: query.json, redis, table, uid,
-  });
 
-  return { message: res, status: 200 };
+  return { message: 'user', status: 200 };
 }

package/server/routes/properties/controllers/user.properties.post.js

@@ -1,30 +1,10 @@
 const table = 'admin.user_properties';
 
-import { setSettings } from '../../../../utils.js';
+
 
 export default async function postSettingsUser({
   pg, session = {}, body = {},
 }) {
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const { key, val } = body;
-
-  if ((!key || !val) && !Object.keys(body).length) {
-    return { message: 'not enough params', status: 400 };
-  }
-
-  if (!pg?.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const res = await setSettings({
-    pg, key, val, body, table, uid,
-  });
-  if (res?.error) return res;
 
-  return { message: res, status: 200 };
+  return { message: 'ok', status: 200 };
 }

package/server/routes/properties/index.mjs

@@ -1,8 +1,8 @@
 import getSettingsApp from './controllers/admin.properties.get.js';
 import postSettingsApp from './controllers/admin.properties.post.js';
 
-import getSettingsUser from './controllers/user.properties.get.js';
-import postSettingsUser from './controllers/user.properties.post.js';
+//import getSettingsUser from './controllers/user.properties.get.js';
+//import postSettingsUser from './controllers/user.properties.post.js';
 
 import getSettingsTable from './controllers/table.properties.get.js';
 import postSettingsTable from './controllers/table.properties.post.js';
@@ -13,8 +13,8 @@ export default async function route(fastify) {
   fastify.get('/settings-app/:key?', { scheme: propertiesSchema }, getSettingsApp);
   fastify.post('/settings-app', { config: { policy: ['admin'] } }, postSettingsApp);
 
-  fastify.get('/settings-user/:key?', { scheme: propertiesSchema }, getSettingsUser);
-  fastify.post('/settings-user', {}, postSettingsUser);
+  //fastify.get('/settings-user/:key?', { scheme: propertiesSchema }, getSettingsUser);
+  // fastify.post('/settings-user', {}, postSettingsUser);
 
   fastify.get('/settings-table/:table/:entity?', {}, getSettingsTable);
   fastify.post('/settings-table/:table', {}, postSettingsTable);

package/server/routes/properties/utils/refreshData.js

@@ -6,7 +6,7 @@ function prepareResult(res) {
   const arr = (res.rows || (Array.isArray(res) ? res : Object.values(res || {})));
   return {
     command: 'INSERT',
-    count: arr.filter((el) => el.command === 'INSERT')
+    count: res?.rowCount || arr.filter((el) => el.command === 'INSERT')
       ?.map((el) => ({ result: 'success', count: el.rowCount }))
       ?.reduce((acc, curr) => acc + curr.count, 0),
   };
@@ -37,13 +37,13 @@ export default async function refreshData({
       data?.forEach((el) => Object.assign(el, { id: el.id || randomUUID() }));
       await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
 
-      const res = dataInsert({
+      const res = await dataInsert({
         pg: client,
         table: 'setting.property',
         data: {
           property_entity: entity,
           object_id: table,
-          property_json: JSON.stringify(data)?.replace(/'/g, "''"),
+          property_json: JSON.stringify(data), // ?.replace(/'+/g, "'")?.replace(/'/g, "''")
         },
         uid,
       });
@@ -103,7 +103,7 @@ export default async function refreshData({
       await client.query('delete from setting.custom_field where $1 in (tablename, object_id)', [table]);
       await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
 
-      const data2 = JSON.stringify(data1?.filter((value, index, array) => array.indexOf(value) === index))?.replace(/'/g, "''");
+      const data2 = JSON.stringify(data1?.filter((value, index, array) => array.indexOf(value) === index)); // ?.replace(/'+/g, "'")?.replace(/'/g, "''")
       const res = await dataInsert({
         pg: client,
         table: 'setting.property',

package/utils.js

@@ -1,14 +1,13 @@
 import yamlSafe from 'js-yaml';
 
-import getSettings from './server/routes/properties/funcs/getSettings.js';
-import setSettings from './server/routes/properties/funcs/setSettings.js';
+
 
 import addNotification from './server/routes/notifications/funcs/addNotification.js';
 import sendNotification from './server/routes/notifications/funcs/sendNotification.js';
 
 import getAdminAccess from './server/plugins/access/funcs/getAdminAccess.js';
 
-function loadSafe (yml) {
+function loadSafe(yml) {
   try {
     return yamlSafe.load(yml);
   } catch (err) {
@@ -21,8 +20,6 @@ Object.assign(yamlSafe, { loadSafe });
 export default null;
 export {
   yamlSafe,
-  getSettings,
-  setSettings,
   addNotification,
   sendNotification,
   getAdminAccess,

package/dist/add-page-B5Yx_gil.js

@@ -1,119 +0,0 @@
-import { _ as h, u as p, e as u } from "./import-file-C1vBdCEv.js";
-import { resolveComponent as d, openBlock as b, createElementBlock as g, createElementVNode as n, createBlock as f, normalizeStyle as x, createCommentVNode as w } from "vue";
-const y = {
-  data() {
-    return {
-      formValues: {},
-      scheme: null,
-      table: "",
-      token: "",
-      api: "",
-      style: null
-    };
-  },
-  mounted() {
-    this.getFormScheme();
-  },
-  methods: {
-    flattenMenu(t) {
-      const e = [];
-      return t.forEach((o) => {
-        o.menu ? e.push(...this.flattenMenu(o.menu)) : e.push(o);
-      }), e;
-    },
-    async getFormScheme() {
-      var i, a;
-      const t = this.flattenMenu(p.value);
-      t != null && t.length || this.$router.replace("/404");
-      const e = t == null ? void 0 : t.find((r) => {
-        var s, l;
-        return (r == null ? void 0 : r.path) == ((l = (s = this.$route) == null ? void 0 : s.query) == null ? void 0 : l.table);
-      });
-      e || this.$router.replace("/404");
-      const o = e == null ? void 0 : e.table;
-      this.table = o;
-      try {
-        const r = await u.get(`/api/table-data/${o}`), { data: s } = await u.get(
-          `/api/template/form/${(i = r == null ? void 0 : r.data) == null ? void 0 : i.form}`
-        );
-        this.scheme = (s == null ? void 0 : s.schema) || s, this.style = (s == null ? void 0 : s.style) || null, this.api = (s == null ? void 0 : s.api) || "", this.token = (a = r == null ? void 0 : r.data) == null ? void 0 : a.addToken;
-      } catch {
-      }
-    },
-    getGroupedErrorNotification(t, e) {
-      debugger;
-      if (!t || !e) return "";
-      const o = {};
-      return Object.entries(t).forEach(([a, r]) => {
-        var l;
-        const s = ((l = e[a]) == null ? void 0 : l.ua) || a;
-        r.forEach((m) => {
-          const c = m.message;
-          o[c] || (o[c] = []), o[c].push(`"${s}"`);
-        });
-      }), Object.entries(o).map(([a, r]) => `<b>${a}:</b> ${r.join(", ")}`).join("<br>") || "Сталася помилка валідації";
-    },
-    async createObject() {
-      var e;
-      const t = this.$refs.form;
-      try {
-        await t.doValidation(), await u.post(
-          this.api || `/api/table/${this.token}`,
-          this.formValues
-        ), await this.$router.back(), await this.$notify({
-          title: "Успішно!",
-          message: "Об'єкт успішно створено",
-          type: "success"
-        });
-      } catch (o) {
-        const i = this.getGroupedErrorNotification(
-          t == null ? void 0 : t.formErrors,
-          t == null ? void 0 : t.scheme
-        );
-        this.$notify({
-          title: "Помилка!",
-          message: ((e = o == null ? void 0 : o.response) == null ? void 0 : e.data) || i,
-          type: "error"
-        });
-      }
-    }
-  }
-}, k = { class: "bg-gray-50 lg:w-[calc(100vw-260px)] w-[100vw]" }, v = { class: "h-[76px] mt-[15px] flex items-center justify-between mx-[20px] px-[20px] bg-white border rounded-xl" }, V = { class: "flex items-center gap-[6px]" }, _ = {
-  style: { height: "calc(100vh - 165px)" },
-  class: "bg-gray-50 p-[20px] flex lg:w-[calc(100vw-260px)] w-[100vw]"
-}, $ = { class: "bg-white w-full rounded-xl border p-[20px] overflow-auto [&::-webkit-scrollbar]:w-2 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar:horizontal]:h-[8px] [&::-webkit-scrollbar-track]:bg-gray-100 [&::-webkit-scrollbar-thumb]:bg-gray-300 dark:[&::-webkit-scrollbar-track]:bg-neutral-700 dark:[&::-webkit-scrollbar-thumb]:bg-neutral-500" };
-function j(t, e, o, i, a, r) {
-  const s = d("VsForm");
-  return b(), g("div", k, [
-    n("div", v, [
-      e[3] || (e[3] = n("h2", { class: "text-xl font-medium" }, "Створити", -1)),
-      n("div", V, [
-        n("button", {
-          onClick: e[0] || (e[0] = (l) => t.$router.back()),
-          class: "flex items-center px-3 py-2 text-sm font-medium text-gray-800 duration-300 bg-white border border-gray-100 rounded-lg shadow gap-x-2 focus:outline-none hover:bg-gray-50 hover:border-gray-100"
-        }, " Скасувати "),
-        n("button", {
-          onClick: e[1] || (e[1] = (...l) => r.createObject && r.createObject(...l)),
-          class: "inline-flex items-center px-3 py-2 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"
-        }, " Зберегти ")
-      ])
-    ]),
-    n("div", _, [
-      n("div", $, [
-        a.scheme ? (b(), f(s, {
-          key: 0,
-          ref: "form",
-          scheme: a.scheme,
-          style: x(a.style),
-          modelValue: a.formValues,
-          "onUpdate:modelValue": e[2] || (e[2] = (l) => a.formValues = l),
-          class: "p-0 mt-[20px]"
-        }, null, 8, ["scheme", "style", "modelValue"])) : w("", !0)
-      ])
-    ])
-  ]);
-}
-const O = /* @__PURE__ */ h(y, [["render", j]]);
-export {
-  O as default
-};