@opengis/admin 0.1.62 → 0.1.64

package/dist/{card-page-B16E7Q7m.js → card-page-CnQufGpK.js}

@@ -1,5 +1,5 @@
-import { i as L, j as R, _ as V, u as H, a as A } from "./import-file-D6JQHFSe.js";
-import { computed as q, resolveComponent as $, openBlock as s, createElementBlock as a, createElementVNode as p, toDisplayString as D, createVNode as z, withCtx as B, createTextVNode as N, createBlock as m, createCommentVNode as v, normalizeClass as M, Fragment as w, renderList as j, resolveDynamicComponent as T } from "vue";
+import { g as L, h as R, _ as V, u as H, a as A } from "./import-file-BkyTVz51.js";
+import { computed as q, resolveComponent as $, openBlock as s, createElementBlock as a, createElementVNode as p, toDisplayString as j, createVNode as z, withCtx as B, createTextVNode as N, createBlock as m, createCommentVNode as v, normalizeClass as M, Fragment as w, renderList as D, resolveDynamicComponent as T } from "vue";
 const E = { class: "h-[76px] bg-white border rounded-xl flex items-center justify-between px-[15px] mb-[16px]" }, S = { class: "text-lg font-semibold md:text-xl text-stone-800 dark:text-neutral-200" }, G = { class: "flex items-center gap-[6px]" }, O = {
   __name: "admin-card-header",
   props: {
@@ -28,7 +28,7 @@ const E = { class: "h-[76px] bg-white border rounded-xl flex items-center justif
             onClick: r,
             class: "text-sm h-[20px] text-blue-600 font-medium hover:border-b hover:border-b-2 hover:border-b-blue-500"
           }, " До таблиці "),
-          p("h2", S, D(t.title), 1)
+          p("h2", S, j(t.title), 1)
         ]),
         p("div", G, [
           z(b, {
@@ -153,26 +153,26 @@ function se(t, n, c, l, r, u) {
     p("div", {
       class: M(["grid gap-[20px]", u.getGridClass()])
     }, [
-      (s(!0), a(w, null, j((b = r.objectData) == null ? void 0 : b.panels, (o, i) => {
+      (s(!0), a(w, null, D((b = r.objectData) == null ? void 0 : b.panels, (o, i) => {
         var C;
         return s(), a("div", {
           key: i,
           class: M(u.getColClass(o.col))
         }, [
           o != null && o.name ? (s(), a("div", P, [
-            p("h2", J, D((o == null ? void 0 : o.title) || "Панель"), 1),
+            p("h2", J, j((o == null ? void 0 : o.title) || "Панель"), 1),
             p("div", {
               class: "p-[20px] border-t",
               innerHTML: (C = r.objectData) == null ? void 0 : C.data[o == null ? void 0 : o.name]
             }, null, 8, K)
           ])) : o.type === "container" ? (s(), a("div", Q, [
-            (s(!0), a(w, null, j(o.items, (e, k) => {
+            (s(!0), a(w, null, D(o.items, (e, k) => {
               var _, x, g, f, y;
               return s(), a("div", {
                 key: k,
                 class: "border rounded-xl bg-white mb-[20px]"
               }, [
-                p("h2", U, D((e == null ? void 0 : e.title) || "Панель"), 1),
+                p("h2", U, j((e == null ? void 0 : e.title) || "Панель"), 1),
                 e != null && e.component ? (s(), a("div", W, [
                   (s(), m(T(e.component), {
                     geometry: (x = (_ = r.objectData) == null ? void 0 : _.rows[0]) == null ? void 0 : x.geom,
@@ -190,16 +190,16 @@ function se(t, n, c, l, r, u) {
           ])) : v("", !0),
           (o == null ? void 0 : o.type) === "tabs" ? (s(), a(w, { key: 2 }, [
             p("nav", Z, [
-              (s(!0), a(w, null, j(o == null ? void 0 : o.items, (e) => (s(), a("button", {
+              (s(!0), a(w, null, D(o == null ? void 0 : o.items, (e) => (s(), a("button", {
                 key: (e == null ? void 0 : e.name) || (e == null ? void 0 : e.component),
                 onClick: (k) => r.component = (e == null ? void 0 : e.component) || (e == null ? void 0 : e.name),
                 class: M(["px-2.5 h-[30px] py-1.5 relative inline-flex items-center gap-x-2 text-gray-500 hover:bg-gray-100 focus:bg-gray-100 hover:text-gray-800 text-sm whitespace-nowrap rounded-lg focus:outline-none", {
                   " font-semibold after:absolute after:bottom-[-14px] after:left-2.5 after:right-2.5 after:z-10 after:h-0.5 after:bg-gray-800": r.component === (e == null ? void 0 : e.component) || r.component === (e == null ? void 0 : e.name),
                   "": r.component !== (e == null ? void 0 : e.component) && r.component !== (e == null ? void 0 : e.name)
                 }])
-              }, D(e == null ? void 0 : e.title), 11, ee))), 128))
+              }, j(e == null ? void 0 : e.title), 11, ee))), 128))
             ]),
-            (s(!0), a(w, null, j(o.items, (e, k) => {
+            (s(!0), a(w, null, D(o.items, (e, k) => {
               var _, x, g, f, y;
               return s(), a(w, { key: k }, [
                 r.component === (e == null ? void 0 : e.component) || r.component === (e == null ? void 0 : e.name) ? (s(), a("div", te, [

package/dist/{card-view-Fw8T0Ddm.js → card-view-MKU1ijjK.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as e, openBlock as r, createBlock as t } from "vue";
-import { _ as c } from "./import-file-D6JQHFSe.js";
+import { _ as c } from "./import-file-BkyTVz51.js";
 const n = {};
 function s(_, p, a, i, f, m) {
   const o = e("router-view");

package/dist/{edit-page-BCPO83LG.js → edit-page-C1wXXuPF.js}

@@ -1,4 +1,4 @@
-import { _ as b, u as h, a as c } from "./import-file-D6JQHFSe.js";
+import { _ as b, u as h, a as c } from "./import-file-BkyTVz51.js";
 import { resolveComponent as d, openBlock as m, createElementBlock as p, createElementVNode as l, createBlock as f, createCommentVNode as g } from "vue";
 const x = {
   data() {

package/dist/{import-file-D6JQHFSe.js → import-file-BkyTVz51.js}

@@ -3590,17 +3590,17 @@ function eq(t) {
 }
 const jI = [
   // { name: 'profile', path: '/profile', component: () => import('../components/profile/vs-profile.vue') },
-  { name: "edit", path: "/edit", component: () => import("./edit-page-BCPO83LG.js") },
-  { name: "add", path: "/add", component: () => import("./add-page-CFNh7Zxz.js") },
+  { name: "edit", path: "/edit", component: () => import("./edit-page-C1wXXuPF.js") },
+  { name: "add", path: "/add", component: () => import("./add-page-LONm322L.js") },
   {
     name: "card-view",
     path: "/card",
-    component: () => import("./card-view-Fw8T0Ddm.js"),
+    component: () => import("./card-view-MKU1ijjK.js"),
     children: [{
       name: "table",
       path: ":table",
-      component: () => import("./card-view-Fw8T0Ddm.js"),
-      children: [{ name: "card", path: ":id", component: () => import("./card-page-B16E7Q7m.js") }]
+      component: () => import("./card-view-MKU1ijjK.js"),
+      children: [{ name: "card", path: ":id", component: () => import("./card-page-CnQufGpK.js") }]
     }]
   }
 ], UI = {}, HI = { class: "bg-gray-200 w-full px-16 md:px-0 h-screen flex items-center justify-center" }, qI = { class: "bg-white border border-gray-200 flex flex-col items-center justify-center px-4 md:px-8 lg:px-24 py-8 rounded-lg shadow-2xl" };
@@ -3648,14 +3648,14 @@ const GI = /* @__PURE__ */ Rt(UI, [["render", WI]]), ZI = (t) => {
         {
           path: "/",
           name: "home",
-          component: () => import("./admin-view-Dw9tWMxP.js"),
+          component: () => import("./admin-view-CEePX3t5.js"),
           children: [
             ...e,
             ...t,
             // { path: '/', redirect: '/home' },
             {
               path: "/:catchAll(.*)",
-              component: () => import("./admin-interface-CniNlJEa.js")
+              component: () => import("./admin-interface-eocB4uF3.js")
             }
           ]
         }
@@ -47510,14 +47510,12 @@ export {
   Rt as _,
   Bt as a,
   T8 as b,
-  ZL as c,
-  vH as d,
-  vU as e,
-  PF as f,
-  YL as g,
-  HB as h,
-  QH as i,
-  eq as j,
-  iq as k,
+  vH as c,
+  vU as d,
+  PF as e,
+  HB as f,
+  QH as g,
+  eq as h,
+  iq as i,
   YH as u
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.1.62",
+  "version": "0.1.64",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",

package/server/plugins/hook.js

@@ -1,30 +1,73 @@
+import config from '../../config.js'
 import { addHook, getToken, setToken, getTemplate } from '@opengis/fastify-table/utils.js';
 
+async function getTokenData({
+    req, mode = 'w', token, uid,
+}) {
+    if (!req) {
+        return { message: 'not enough params: req', status: 400 };
+    }
+    if (!token) {
+        return { message: 'not enough params: token', status: 400 };
+    }
+
+    if (!uid && !config?.auth?.disable) {
+        return { message: 'access restricted: uid', status: 403 };
+    }
+
+    const opt = await getToken({
+        uid, token, mode, json: 1,
+    });
+
+    if (!opt && !config?.local) {
+        return { message: 'access restricted: edit', status: 403 };
+    }
+    return opt;
+}
+
 export default async function plugin(fastify) {
 
-    addHook('preTable', async ({ req }) => {
-        if (!req?.routeOptions?.method) return;
-        const mode = { POST: 'a', DELETE: 'w', PUT: 'w', GET: 'w' }[req.routeOptions.method] || 'w';
-        const { funcs, params = {}, session = {} } = req;
-        const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : (session?.passport?.user || {});
-        const opt = await getToken({
-            uid, token: params.id || params.form || params.table, mode, json: 1,
-        });
-        if (opt) Object.assign(req, { opt });
-        if (!opt && !funcs?.config?.local) {
-            return { message: 'access restricted: edit', status: 403 };
-        }
-        return null;
+    addHook('preTable', async ({ req, table, user = {} }) => {
+        const { uid } = config?.auth?.disable ? { uid: '1' } : user || {};
+
+        //const opt = await getTokenData({ req, mode: 'w', token: table, uid });
+        //        return opt;
+    });
+    addHook('preData', async ({ req, table, id, user = {} }) => {
+        const { uid } = config?.auth?.disable ? { uid: '1' } : user || {};
+        const opt = await getTokenData({ req, mode: 'w', token: table, uid });
+        return opt;
+    });
+    addHook('preForm', async ({ req, form, user }) => {
+        const { uid } = config?.auth?.disable ? { uid: '1' } : user || {};
+        const opt = await getTokenData({ req, mode: 'w', token: form, uid });
+        return opt;
+    });
+    addHook('preInsert', async ({ req, table, user }) => {
+        const { uid } = config?.auth?.disable ? { uid: '1' } : user || {};
+        const opt = await getTokenData({ req, mode: 'a', token: table, uid });
+        return opt;
+    });
+    addHook('preUpdate', async ({ req, table, id, user }) => {
+        const { uid } = config?.auth?.disable ? { uid: '1' } : user || {};
+        const opt = await getTokenData({ req, mode: 'w', token: table, uid });
+        return opt;
+    });
+    addHook('preDelete', async ({ req, table, id, user }) => {
+        const { uid } = config?.auth?.disable ? { uid: '1' } : user || {};
+        const opt = await getTokenData({ req, mode: 'w', token: table, uid });
+        return opt;
     });
 
-    addHook('afterTable', async ({ req = {}, res = {}, rows = [], table }) => {
-        const { pg, funcs, params = {}, session = {} } = req;
-        const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : (session?.passport?.user || {});
-        if (!uid || !table || !pg?.pk?.[table] || !rows.length || !params.table) return;
+    addHook('afterTable', async ({ req = {}, table, res = {}, rows = [], user = {} }) => {
+        const { pg } = req;
+        const loadTable = await getTemplate('table', table);
+        const { uid } = config?.auth?.disable ? { uid: '1' } : user;
+        if (!uid || !table || !pg?.pk?.[table] || !rows.length || !loadTable?.table) return;
 
         // admin.custom_column - user column data
         const { rows: properties = [] } = await pg.query(`select column_id, name, title, format, data from admin.custom_column 
-    where _table and entity=$1 and uid=$2`, [params.table, uid]);
+        where _table and entity=$1 and uid=$2`, [table, uid]);
         const extraColumnList = properties.map((row) => ({ id: row.column_id, name: row.name, title: row.title, format: row.format, data: row.data }));
         if (!extraColumnList?.length) return;
 
@@ -33,7 +76,7 @@ export default async function plugin(fastify) {
         }
 
         const { rows: extraData = [] } = await pg.query(`select object_id, json_object_agg( property_id, coalesce(value_date::text,value_text) ) as extra from crm.extra_data 
-    where property_entity=$1 and property_id=any($2) and object_id=any($3) group by object_id`, [params.table, extraColumnList?.map((el) => el.id), rows.map((el) => el.id)]);
+        where property_entity=$1 and property_id=any($2) and object_id=any($3) group by object_id`, [table, extraColumnList?.map((el) => el.id), rows.map((el) => el.id)]);
 
         if (!extraData?.length) {
             // Object.assign(rows?.[0] || {}, { ...extraColumnList.reduce((acc, curr) => Object.assign(acc, { [curr.name]: null }), {}) });
@@ -60,7 +103,7 @@ export default async function plugin(fastify) {
     });
 
     // extract table from form token for user columns - p.2 - read (refactor to global token)
-    /* addHook('preTemplate', async ({ req = {} }) => {
+    /* addHook('preTemplate', async ({ req = {}, name, type, user }) => {
         const { funcs, params = {}, session = {} } = req;
         const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : (session?.passport?.user || {});
         if (!uid || params?.type !== 'form' || !params?.name) return null;
@@ -73,9 +116,9 @@ export default async function plugin(fastify) {
         }
     }); */
 
-    addHook('afterTemplate', async ({ req = {}, data = {} }) => {
-        const { funcs, session = {} } = req;
-        const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : (session?.passport?.user || {});
+    addHook('afterTemplate', async ({ req = {}, data = {}, user = {} }) => {
+        const { funcs } = req;
+        const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : user;
         const { pg, params = {} } = req;
         // extract table from form token for user columns - p.1 - assign (refactor to global token)
         /* if (params?.type === 'table') {
@@ -100,11 +143,11 @@ export default async function plugin(fastify) {
         }));
     });
 
-    addHook('afterUpdate', async ({ req, res = {} }) => {
+    addHook('afterUpdate', async ({ req, res = {}, user = {} }) => {
         const {
-            pg, funcs, session = {}, params = {}, body = {},
+            pg, params = {}, body = {},
         } = req;
-        const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : (session?.passport?.user || {});
+        const { uid } = config?.auth?.disable ? { uid: '1' } : user;
         if (!uid) return null;
 
         const loadTable = await getTemplate('table', params.table);
@@ -125,11 +168,11 @@ export default async function plugin(fastify) {
         return pg.query(q);
     });
 
-    addHook('afterInsert', async ({ req, res = {} }) => {
+    addHook('afterInsert', async ({ req, res = {}, user = {} }) => {
         const {
-            pg, funcs, session = {}, params = {}, body = {},
+            pg, params = {}, body = {},
         } = req;
-        const { uid } = funcs?.config?.auth?.disable ? { uid: '1' } : (session?.passport?.user || {});
+        const { uid } = config?.auth?.disable ? { uid: '1' } : user;
         if (!uid) return null;
 
         const loadTable = await getTemplate('table', params.table);

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

@@ -14,7 +14,7 @@ export default async function getTableData(req) {
     const time = Date.now();
 
     const {
-        pg, params, funcs = {}, query = {}, opt = {}, session = {}, mode = 'table',
+        pg, params, funcs = {}, query = {}, opt = {}, session = {},
     } = req;
     const { uid } = session.passport?.user || {};
 
@@ -99,7 +99,7 @@ export default async function getTableData(req) {
             time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, meta, columns,
         };
 
-        await applyHook('afterTable', { req, res, table, rows });
+        await applyHook('afterTable', { req, table: params?.table, res, rows, user: session?.passport?.user });
         await metaFormat({ funcs, rows, table: params.table });
 
 

package/server/routes/templates/controllers/getTemplate.js

@@ -1,10 +1,12 @@
 import { applyHook, getTemplate } from "@opengis/fastify-table/utils.js";
 
 export default async function getTemplateApi(req) {
-    const res = await applyHook('preTemplate', { req });
+    const { user } = req?.session?.passport || {};
+    const { funcs, params = {}, session = {} } = req;
+    const res = await applyHook('preTemplate', { req, name: params?.name, type: params?.type, user });
     if (res) return res;
 
-    const { funcs, params = {}, session = {} } = req;
+
     const { type, name } = params;
 
     const data = await getTemplate(type, name);
@@ -16,6 +18,6 @@ export default async function getTemplateApi(req) {
     ) {
         return `access restricted ${name}`;
     }
-    await applyHook('afterTemplate', { req, data })
+    await applyHook('afterTemplate', { req, data, user })
     return data?.html || data || `template not found "${name}"`;
 }