@opengis/admin 0.1.98 → 0.1.100

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

@@ -35,34 +35,21 @@ export default async function adminMenu({ user = {}, session, pg = pgClients.cli
     const menus = isProduction && menuCache.length ? menuCache : await readMenu();
 
     // update user access
-    if (session && user?.uid) {
-        const { type, gl = [] } = await pg.query(`select user_type as type, b.gl from admin.users a
-        left join lateral (
-            select array_agg(role_id) as gl from admin.user_roles where user_uid=a.uid
-        )b on 1=1 where uid=$1`, [user.uid]).then(el => el.rows[0] || {});
-        /* const { interfaces = [] } = await pg.query(`select array_agg(route_id) as interfaces from admin.access
+    if (session && user?.uid && user.type !== '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
+        left join lateral ( select array_agg(role_id) as gl from admin.user_roles where user_uid=a.uid)b on 1=1
+        left join lateral ( select array_agg(route_id) as routes from admin.role_access where role_id=any(b.gl))r on 1=1
+        where uid=$1`, [user.uid]).then(el => el.rows[0] || {});
+        /* const { interfaces = [] } = await pg.query(`select array_agg(route_id) as interfaces from admin.role_access
         where user_uid=$1 or role_id=any($2::text[])`, [user.uid, gl]).then((res) => res.rows?.[0] || {}); */
-        Object.assign(user, { type, group_list: gl });
+
+        Object.assign(user, { type, group_list: gl, routes });
         session?.set?.('passport', { user });
+        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))
     }
-    return menus;
 
-    if (req) {
-        const user = req?.session?.passport?.user || {};
-        const userMenu = await Promise.all(menus.map(async (menu) => {
-            if (menu?.menu?.length) {
-                const submenu = await Promise.all(menu.menu?.map(async (submenu) => {
-                    const access = await getAccess({ table: submenu?.table, user });
-                    return { ...submenu, access };
-                }));
-                return { ...menu, menu: submenu.filter((e) => e?.access), access: submenu.filter((e) => e?.access?.actions?.includes('get'))?.length };
-            } else if (menu?.table) {
-                const access = await getAccess({ table: menu?.table, user });
-                return { ...menu, access };
-            }
-            return menu;
-        }));
-        return userMenu.filter((e) => e?.access)?.map((e) => ({ ...e, menu: e?.menu ? e?.menu?.filter((el) => el?.access?.actions?.includes('get')) : undefined }));
-    }
     return menus;
+
+
 }

package/dist/IconChevronDown-irxwDmQp.js

@@ -1,26 +0,0 @@
-import { openBlock as e, createElementBlock as t, createElementVNode as n } from "vue";
-import { _ as r } from "./import-file-eH-_Imyb.js";
-const l = {}, s = {
-  xmlns: "http://www.w3.org/2000/svg",
-  viewBox: "0 0 24 24",
-  fill: "none",
-  stroke: "currentColor",
-  "stroke-width": "2",
-  "stroke-linecap": "round",
-  "stroke-linejoin": "round",
-  class: "icon icon-tabler icons-tabler-outline icon-tabler-chevron-down"
-};
-function c(i, o, a, p, d, u) {
-  return e(), t("svg", s, o[0] || (o[0] = [
-    n("path", {
-      stroke: "none",
-      d: "M0 0h24v24H0z",
-      fill: "none"
-    }, null, -1),
-    n("path", { d: "M6 9l6 6l6 -6" }, null, -1)
-  ]));
-}
-const m = /* @__PURE__ */ r(l, [["render", c]]);
-export {
-  m as I
-};

package/dist/add-page-UtwEANeW.js

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