@opengis/admin 0.2.132 → 0.2.134

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/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-DQ70Si9f.js

@@ -1,104 +0,0 @@
-import { _ as g, u as f, e as u } from "./import-file-CztGvKRc.js";
-import { resolveComponent as x, openBlock as h, createElementBlock as w, createElementVNode as n, createBlock as y, normalizeStyle as k, createCommentVNode as v } from "vue";
-const V = {
-  data() {
-    return {
-      formValues: {},
-      scheme: null,
-      table: "",
-      token: "",
-      api: "",
-      style: null
-    };
-  },
-  mounted() {
-    this.getFormScheme();
-  },
-  methods: {
-    flattenMenu(t) {
-      const e = [];
-      return t.forEach((a) => {
-        a.menu ? e.push(...this.flattenMenu(a.menu)) : e.push(a);
-      }), e;
-    },
-    async getFormScheme() {
-      var i, o;
-      const t = this.flattenMenu(f.value);
-      t != null && t.length || this.$router.replace("/404");
-      const e = t == null ? void 0 : t.find((s) => {
-        var r, l;
-        return (s == null ? void 0 : s.path) == ((l = (r = this.$route) == null ? void 0 : r.query) == null ? void 0 : l.table);
-      });
-      e || this.$router.replace("/404");
-      const a = e == null ? void 0 : e.table;
-      this.table = a;
-      try {
-        const s = await u.get(`/api/table-data/${a}`), { data: r } = await u.get(
-          `/api/template/form/${(i = s == null ? void 0 : s.data) == null ? void 0 : i.form}`
-        );
-        this.scheme = (r == null ? void 0 : r.schema) || r, this.style = (r == null ? void 0 : r.style) || null, this.api = (r == null ? void 0 : r.api) || "", this.token = (o = s == null ? void 0 : s.data) == null ? void 0 : o.addToken;
-      } catch {
-      }
-    },
-    async createObject() {
-      var e, a, i, o, s, r, l, m, b;
-      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 (c) {
-        const p = ((e = c == null ? void 0 : c.response) == null ? void 0 : e.data) || "";
-        let d = ((s = (o = (i = (a = Object.entries(t == null ? void 0 : t.formErrors)) == null ? void 0 : a[0]) == null ? void 0 : i[1]) == null ? void 0 : o[0]) == null ? void 0 : s.message) === "Це поле обов'язкове" ? "Заповніть обов'язкові поля" : (b = (m = (l = (r = Object.entries(t == null ? void 0 : t.formErrors)) == null ? void 0 : r[0]) == null ? void 0 : l[1]) == null ? void 0 : m[0]) == null ? void 0 : b.message;
-        this.$notify({
-          title: "Помилка!",
-          message: p || d || "Сталася помилка валідаціі",
-          type: "error"
-        });
-      }
-    }
-  }
-}, _ = { class: "bg-gray-50 lg:w-[calc(100vw-260px)] w-[100vw]" }, $ = { class: "h-[76px] mt-[15px] flex items-center justify-between mx-[20px] px-[20px] bg-white border rounded-xl" }, j = { class: "flex items-center gap-[6px]" }, E = {
-  style: { height: "calc(100vh - 165px)" },
-  class: "bg-gray-50 p-[20px] flex lg:w-[calc(100vw-260px)] w-[100vw]"
-}, O = { 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 C(t, e, a, i, o, s) {
-  const r = x("VsForm");
-  return h(), w("div", _, [
-    n("div", $, [
-      e[3] || (e[3] = n("h2", { class: "text-xl font-medium" }, "Створити", -1)),
-      n("div", j, [
-        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) => s.createObject && s.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", E, [
-      n("div", O, [
-        o.scheme ? (h(), y(r, {
-          key: 0,
-          ref: "form",
-          scheme: o.scheme,
-          style: k(o.style),
-          modelValue: o.formValues,
-          "onUpdate:modelValue": e[2] || (e[2] = (l) => o.formValues = l),
-          class: "p-0 mt-[20px]"
-        }, null, 8, ["scheme", "style", "modelValue"])) : v("", !0)
-      ])
-    ])
-  ]);
-}
-const B = /* @__PURE__ */ g(V, [["render", C]]);
-export {
-  B as default
-};

package/dist/edit-page-BWRXfML4.js

@@ -1,125 +0,0 @@
-import { _ as g, u as f, e as b } from "./import-file-CztGvKRc.js";
-import { resolveComponent as y, openBlock as p, createElementBlock as x, createElementVNode as u, createBlock as w, normalizeStyle as k, createCommentVNode as v } from "vue";
-const V = {
-  data() {
-    return {
-      formValues: {},
-      scheme: null,
-      table: "",
-      token: "",
-      style: null
-    };
-  },
-  mounted() {
-    this.getFormScheme();
-  },
-  methods: {
-    flattenMenu(e) {
-      const t = [];
-      return e.forEach((l) => {
-        l.menu ? t.push(...this.flattenMenu(l.menu)) : t.push(l);
-      }), t;
-    },
-    async getFormScheme() {
-      var i, r;
-      const e = this.flattenMenu(f.value);
-      e != null && e.length || this.$router.replace("/404");
-      const t = e == null ? void 0 : e.find((o) => {
-        var a, s;
-        return (o == null ? void 0 : o.path) == ((s = (a = this.$route) == null ? void 0 : a.query) == null ? void 0 : s.table);
-      });
-      t || this.$router.replace("/404");
-      const l = t == null ? void 0 : t.table;
-      this.table = l;
-      try {
-        const {
-          data: { form: o }
-        } = await b.get(`/api/template/table/${l}`), { data: a } = await b.get(
-          `/api/table/${this.table}/${(r = (i = this.$route) == null ? void 0 : i.query) == null ? void 0 : r.id}`
-        );
-        this.token = (a == null ? void 0 : a.token) || "", this.formValues = a || {};
-        const { data: s } = await b.get(`/api/template/form/${o}`);
-        this.scheme = (s == null ? void 0 : s.schema) || s, this.style = (s == null ? void 0 : s.style) || null;
-      } catch {
-      }
-    },
-    async onlyEditObject() {
-      var t, l, i, r, o, a, s, n, m;
-      const e = this.$refs.form;
-      try {
-        await e.doValidation(), await b.put(`/api/table/${this.token}`, this.formValues), await this.$notify({
-          title: "Успішно!",
-          message: "Об'єкт успішно створено",
-          type: "success"
-        });
-      } catch (c) {
-        const d = ((t = c == null ? void 0 : c.response) == null ? void 0 : t.data) || "";
-        let h = ((o = (r = (i = (l = Object.entries(e == null ? void 0 : e.formErrors)) == null ? void 0 : l[0]) == null ? void 0 : i[1]) == null ? void 0 : r[0]) == null ? void 0 : o.message) === "Це поле обов'язкове" ? "Заповніть обов'язкові поля" : (m = (n = (s = (a = Object.entries(e == null ? void 0 : e.formErrors)) == null ? void 0 : a[0]) == null ? void 0 : s[1]) == null ? void 0 : n[0]) == null ? void 0 : m.message;
-        this.$notify({
-          title: "Помилка!",
-          message: d || h || "Сталася помилка валідаціі",
-          type: "error"
-        });
-      }
-    },
-    async editObjectAndRedirect() {
-      var t, l, i, r, o, a, s, n, m;
-      const e = this.$refs.form;
-      try {
-        await e.doValidation(), await b.put(`/api/table/${this.token}`, this.formValues), await this.$router.back(), await this.$notify({
-          title: "Успішно!",
-          message: "Об'єкт успішно створено",
-          type: "success"
-        });
-      } catch (c) {
-        const d = ((t = c == null ? void 0 : c.response) == null ? void 0 : t.data) || "";
-        let h = ((o = (r = (i = (l = Object.entries(e == null ? void 0 : e.formErrors)) == null ? void 0 : l[0]) == null ? void 0 : i[1]) == null ? void 0 : r[0]) == null ? void 0 : o.message) === "Це поле обов'язкове" ? "Заповніть обов'язкові поля" : (m = (n = (s = (a = Object.entries(e == null ? void 0 : e.formErrors)) == null ? void 0 : a[0]) == null ? void 0 : s[1]) == null ? void 0 : n[0]) == null ? void 0 : m.message;
-        this.$notify({
-          title: "Помилка!",
-          message: d || h || "Сталася помилка валідаціі",
-          type: "error"
-        });
-      }
-    }
-  }
-}, $ = { class: "bg-gray-50 lg:w-[calc(100vw-260px)] w-[100vw]" }, _ = { class: "h-[76px] mt-[15px] flex items-center justify-between mx-[20px] px-[20px] bg-white border rounded-xl" }, E = { class: "flex items-center gap-[6px]" }, j = {
-  style: { height: "calc(100vh - 155px)" },
-  class: "bg-gray-50 p-[20px] flex lg:w-[calc(100vw-260px)] w-[100vw]"
-}, O = { 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 C(e, t, l, i, r, o) {
-  var s;
-  const a = y("VsForm");
-  return p(), x("div", $, [
-    u("div", _, [
-      t[3] || (t[3] = u("h2", { class: "text-xl font-medium" }, "Редагувати", -1)),
-      u("div", E, [
-        u("button", {
-          onClick: t[0] || (t[0] = (n) => e.$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"
-        }, " Скасувати "),
-        u("button", {
-          onClick: t[1] || (t[1] = (...n) => o.editObjectAndRedirect && o.editObjectAndRedirect(...n)),
-          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"
-        }, " Зберегти ")
-      ])
-    ]),
-    u("div", j, [
-      u("div", O, [
-        r.scheme ? (p(), w(a, {
-          key: 0,
-          ref: "form",
-          scheme: r.scheme,
-          columns: (s = r.style) == null ? void 0 : s.columns,
-          style: k(r.style),
-          modelValue: r.formValues,
-          "onUpdate:modelValue": t[2] || (t[2] = (n) => r.formValues = n),
-          class: "p-0 mt-[20px]"
-        }, null, 8, ["scheme", "columns", "style", "modelValue"])) : v("", !0)
-      ])
-    ])
-  ]);
-}
-const A = /* @__PURE__ */ g(V, [["render", C]]);
-export {
-  A as default
-};

package/server/routes/properties/funcs/getSettings.js

@@ -1,56 +0,0 @@
-import { getMeta } from '@opengis/fastify-table/utils.js';
-
-const match = {
-  property_key: 'key',
-  property_json: 'json',
-  property_int: 'int',
-  property_text: 'text',
-};
-
-function getQuery({
-  table, columns = [], key, uid,
-}) {
-  const columnList = columns?.filter((el) => match[el?.name]).map((el) => el?.name).map((el) => `${el} as ${match[el]}`);
-  const sql = `select ${columnList.join(',')} from ${table} where 1=1`;
-
-  if (table === 'admin.user_properties') {
-    const args = [uid, key].filter((el) => el);
-    const q = sql + (uid ? ' and uid=$1' : '') + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
-    return { q, args };
-  }
-  const args = [key].filter((el) => el);
-  const q = sql + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
-  return { q, args };
-}
-
-export default async function getSettings({
-  pg, redis, json, key, table = 'admin.properties', uid,
-}) {
-  const { columns = [] } = await getMeta({ table });
-
-  const { q, args } = getQuery({
-    table, columns, key, uid,
-  });
-
-  const { rows } = await pg.query(q, args);
-  const data = rows?.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
-  
-  const jsonData = Object.keys(data || {}).reduce((acc, curr) => {
-    const [ckey, csubkey] = curr.split('.');
-    if (!csubkey) return Object.assign(acc, { [curr]: data[curr] });
-    if (!acc[ckey]) Object.assign(acc, { [ckey]: {} });
-    Object.assign(acc[ckey], { [csubkey]: data[curr] });
-    return acc;
-  }, {});
-
-  // save both
-  if (redis) {
-    const keyCacheJSON = `${pg.options?.database}:settings:${key || 'all'}:json:${table}`;
-    await redis.set(keyCacheJSON, JSON.stringify(jsonData));
-
-    const keyCachePlain = `${pg.options?.database}:settings:${key || 'all'}:plain:${table}`;
-    await redis.set(keyCachePlain, JSON.stringify(data));
-  }
-
-  return json ? jsonData : data;
-}

package/server/routes/properties/funcs/setSettings.js

@@ -1,44 +0,0 @@
-import { getRedis } from '@opengis/fastify-table/utils.js';
-
-import { getSettings } from '../../../../utils.js';
-import dataInsert from '../utils/dataInsert.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 setSettings({
-  pg, key, val, body = {}, table = 'admin.properties', uid,
-}) {
-  const body1 = key && val ? { [key]: val } : body;
-  const keys = Object.keys(body1);
-  try {
-    const redis = getRedis();
-    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(body1[el]);
-      const data = { property_key: el, [columnType]: body1[el], uid };
-      const { rows } = await dataInsert({
-        pg, table, data, uid,
-      });
-      return { key: el, rows: { val: body[el], data: rows?.[0] } };
-    }));
-
-    const res = await getSettings({
-      pg, redis, table, uid,
-    });
-    return res;
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}