@opengis/fastify-table 2.3.3 → 2.3.5

package/dist/server/plugins/policy/funcs/checkPermissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkPermissions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAMhC,wBAA8B,gBAAgB,CAAC,GAAG,EAAE,eAAe;;;UA+DlE"}
+{"version":3,"file":"checkPermissions.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAMhC,wBAA8B,gBAAgB,CAAC,GAAG,EAAE,eAAe;;;UA4DlE"}

package/dist/server/plugins/policy/funcs/checkPermissions.js

@@ -17,10 +17,7 @@ export default async function checkPermissions(req) {
         return null;
     }
     const userPermissions = await getUserPermissions({ uid: user?.uid, userType: user?.user_type }, pg).then((arr) => arr.reduce((acc, curr) => ({ ...acc, [curr.name]: curr.actions }), {}));
-    const havePermission = Object.keys(userPermissions).length &&
-        permissions?.length &&
-        permissions.length ===
-            permissions.filter(([key, value]) => userPermissions[key]?.includes(value)).length;
+    const havePermission = permissions?.some(([key, value]) => userPermissions?.[key]?.includes(value)) ?? false;
     if (!user?.user_type?.includes?.("admin") && !havePermission) {
         logger.file("policy/permissions", {
             path,

package/dist/server/plugins/table/funcs/getSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSelect.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelect.ts"],"names":[],"mappings":"AAYA,wBAA8B,SAAS,CACrC,IAAI,EAAE,GAAG,EACT,EAAE,MAAmB,EACrB,OAAO,UAAQ,gBAgChB"}
+{"version":3,"file":"getSelect.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelect.ts"],"names":[],"mappings":"AAYA,wBAA8B,SAAS,CACrC,IAAI,EAAE,GAAG,EACT,EAAE,MAAmB,EACrB,OAAO,UAAQ,gBAmChB"}

package/dist/server/plugins/table/funcs/getSelect.js

@@ -23,6 +23,9 @@ export default async function getSelect(name, pg = pgClients.client, nocache = f
             .then((el) => el.rows?.find((item) => item?.data)?.data)
         : undefined;
     const clsData = clsDataDB ?? clsDataGIT;
+    if (type === "json" && !clsData) {
+        return { arr: [] }; // return 200 after creation of empty user cls
+    }
     if (!clsData)
         return null;
     //  console.log(clsData);

package/dist/server/plugins/usercls/index.d.ts

@@ -13,7 +13,10 @@ export declare function addCustomCls({ name, description, alias, table, uid, dat
         active?: boolean;
     }[];
 }, pg?: any): Promise<string>;
-export declare function deleteUserCls(name: string, pg?: any): Promise<string>;
+export declare function deleteUserCls({ name, code }: {
+    name: string;
+    code?: string;
+}, pg?: any): Promise<string>;
 export declare function addUserCls({ name, alias, data, description, }: {
     name: string;
     alias?: string[];

package/dist/server/plugins/usercls/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/usercls/index.ts"],"names":[],"mappings":"AAMA,wBAAsB,YAAY,CAChC,EACE,IAAI,EACJ,WAAW,EACX,KAAK,EACL,KAAK,EACL,GAAG,EACH,IAAS,GACV,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE;QACJ,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,EAAE,CAAC;CACL,EACD,EAAE,MAAmB,mBA8EtB;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAmB,mBAUtE;AAED,wBAAsB,UAAU,CAC9B,EACE,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,WAAW,GACZ,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC,EACD,EAAE,MAAmB,mBAkDtB;AAED,wBAAsB,WAAW,CAC/B,EACE,IAAI,EACJ,KAAK,EACL,WAAW,EACX,IAAI,GACL,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC,EACD,EAAE,MAAmB,mBAKtB;AAED,wBAAsB,cAAc,CAClC,EACE,IAAI,EACJ,MAAM,EACN,GAAG,EACH,MAAM,EACN,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,EACD,EAAE,MAAmB,gBAgDtB;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAmB;;;;;UAsBnE;;AAED,wBAAoB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/usercls/index.ts"],"names":[],"mappings":"AAMA,wBAAsB,YAAY,CAChC,EACE,IAAI,EACJ,WAAW,EACX,KAAK,EACL,KAAK,EACL,GAAG,EACH,IAAS,GACV,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE;QACJ,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,EAAE,CAAC;CACL,EACD,EAAE,MAAmB,mBA8EtB;AAED,wBAAsB,aAAa,CACjC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAC/C,EAAE,MAAmB,mBAgBtB;AAED,wBAAsB,UAAU,CAC9B,EACE,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,WAAW,GACZ,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC,EACD,EAAE,MAAmB,mBAqDtB;AAED,wBAAsB,WAAW,CAC/B,EACE,IAAI,EACJ,KAAK,EACL,WAAW,EACX,IAAI,GACL,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC,EACD,EAAE,MAAmB,mBAKtB;AAED,wBAAsB,cAAc,CAClC,EACE,IAAI,EACJ,MAAM,EACN,GAAG,EACH,MAAM,EACN,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,EACD,EAAE,MAAmB,gBAgDtB;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAmB;;;;;UAsBnE;;AAED,wBAAoB"}

package/dist/server/plugins/usercls/index.js

@@ -62,21 +62,25 @@ export async function addCustomCls({ name, description, alias, table, uid, data
         client.release();
     }
 }
-export async function deleteUserCls(name, pg = pgClients.client) {
+export async function deleteUserCls({ name, code }, pg = pgClients.client) {
+    if (!name) {
+        throw new Error("not enough params: name");
+    }
     const exists = await getUserCls(name, pg);
     if (!exists) {
         throw new NotFoundError("user classifier not found");
     }
-    await pg.query("delete from admin.user_cls where (name=$1 and parent is null) or parent=$1 ", [name]);
+    await pg.query(`delete from admin.user_cls where ((name=$1 and parent is null) or parent=$1) and ${code ? "code=$2" : "true"}`, [name, code].filter(Boolean));
     return "ok";
 }
 export async function addUserCls({ name, alias, data, description, }, pg = pgClients.client) {
     const type = typeof data === "string" ? "sql" : "json";
-    if (type === "json" && !Array.isArray(data)) {
+    if (type === "json" && data && !Array.isArray(data)) {
         throw new Error("param data must be an array");
     }
     if (type === "json" &&
-        typeof data === "object" &&
+        Array.isArray(data) &&
+        data.length &&
         !data.find((item) => item.id && item.text)) {
         throw new Error("param data must have items");
     }
@@ -90,19 +94,21 @@ export async function addUserCls({ name, alias, data, description, }, pg = pgCli
                 data: { name, alias, description, type, data },
             });
         }
-        else if (type === "json" && Array.isArray(data)) {
+        else if (type === "json") {
             await dataInsert({
                 pg: client,
                 table: "admin.user_cls",
                 data: { name, alias, description, type },
             });
-            await Promise.all(data.map(async (item) => {
-                await dataInsert({
-                    pg: client,
-                    table: "admin.user_cls",
-                    data: { ...item, code: item.id, name: item.text, parent: name },
-                });
-            }));
+            if (Array.isArray(data) && data.length) {
+                await Promise.all(data.map(async (item) => {
+                    await dataInsert({
+                        pg: client,
+                        table: "admin.user_cls",
+                        data: { ...item, code: item.id, name: item.text, parent: name },
+                    });
+                }));
+            }
         }
         await client.query("commit");
         return "ok";
@@ -116,7 +122,7 @@ export async function addUserCls({ name, alias, data, description, }, pg = pgCli
     }
 }
 export async function editUserCls({ name, alias, description, data, }, pg = pgClients.client) {
-    await deleteUserCls(name, pg);
+    await deleteUserCls({ name }, pg);
     await addUserCls({ name, alias, description, data }, pg);
     return "ok";
 }

package/dist/server/routes/table/controllers/suggest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAuBpD,wBAAsB,kBAAkB,CAAC,EACvC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,GAAG,EACH,EAAqB,GACtB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB;;;;;UAwFA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA0XzD"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAuBpD,wBAAsB,kBAAkB,CAAC,EACvC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,GAAG,EACH,EAAqB,GACtB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB;;;;;UAwFA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAuYzD"}

package/dist/server/routes/table/controllers/suggest.js

@@ -32,7 +32,7 @@ export async function getTableColumnMeta({ table, template, column, selectName,
             color: "#B8B8B8",
             icon: null,
             id: "null",
-            text: "None",
+            text: "Показати порожні значення",
         });
     }
     // w/out select
@@ -268,13 +268,14 @@ export default async function suggest(req, reply) {
     const where = [search, val, filter, meta.pk ? `${meta.pk} is not null` : null]
         .filter(Boolean)
         .join(" and ") || "true";
-    // const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} ${meta.original.toLowerCase().includes("order by") ? "" : "order by 2"}) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || "0");
-    const sqlSuggest = `${meta.original}
-  WHERE EXISTS ( SELECT 1 FROM ${tableName} o WHERE o.${column} IS NOT DISTINCT FROM c.id ) and ${val || "true"} and ${search || "true"}
-  ${meta.original.toLowerCase().includes("order by") ? "" : "order by 2"}
-  LIMIT ${Math.min(query.limit || meta.limit || limit, limit)}`
-        .replace(/{{parent}}/gi, parent)
-        .replace(/{{uid}}/g, user?.uid || "0");
+    const sqlSuggest = tableName && column
+        ? `${meta.original}
+          WHERE EXISTS ( SELECT 1 FROM ${tableName} o WHERE o.${column} IS NOT DISTINCT FROM c.id ) and ${val || "true"} and ${search || "true"}
+          ${meta.original.toLowerCase().includes("order by") ? "" : "order by 2"}
+          LIMIT ${Math.min(query.limit || meta.limit || limit, limit)}`
+            .replace(/{{parent}}/gi, parent)
+            .replace(/{{uid}}/g, user?.uid || "0")
+        : `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} ${meta.original.toLowerCase().includes("order by") ? "" : "order by 2"}) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || "0");
     if (query.sql && debugMode) {
         return sqlSuggest;
     }
@@ -283,7 +284,7 @@ export default async function suggest(req, reply) {
     const data = dataNew.filter((el) => Object.hasOwn(el, "id") && Object.hasOwn(el, "text"));
     data
         .filter((el) => el.id === null)
-        .forEach((el) => Object.assign(el, { id: "null", text: "None" }));
+        .forEach((el) => Object.assign(el, { id: "null", text: "Показати порожні значення" }));
     // table:column + select
     if (tableName && column) {
         const { name = selectName || column, type = "select" } = getColumnCLS(tableName, column) || {};

package/dist/server/routes/usercls/controllers/deleteUserCls.js

@@ -2,7 +2,7 @@ import pgClients from "../../../plugins/pg/pgClients.js";
 import getSelectMeta from "../../../plugins/table/funcs/getSelectMeta.js";
 import { deleteUserCls } from "../../../plugins/usercls/index.js";
 export default async function deleteUserClsApi({ pg = pgClients.client, params, user }, reply) {
-    const { name } = params;
+    const { name, code } = params;
     const t1 = Date.now();
     if (!user?.uid) {
         return reply.status(401).send({ error: "unauthorized", code: 401 });
@@ -12,6 +12,6 @@ export default async function deleteUserClsApi({ pg = pgClients.client, params,
         name,
         nocache: 1,
     });
-    await deleteUserCls(name, pg);
-    return reply.status(200).send({ time: Date.now() - t1, name });
+    await deleteUserCls({ name, code }, pg);
+    return reply.status(200).send({ time: Date.now() - t1, name, code });
 }

package/dist/server/routes/usercls/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/usercls/index.ts"],"names":[],"mappings":"AAgCA,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,GAAG,QAqCtC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/usercls/index.ts"],"names":[],"mappings":"AAiCA,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,GAAG,QA4CtC"}

package/dist/server/routes/usercls/index.js

@@ -2,6 +2,7 @@ const userClsParamsSchema = {
     type: "object",
     properties: {
         name: { type: "string" },
+        code: { type: "string" },
     },
     required: ["name"],
 };
@@ -12,7 +13,7 @@ const addUserClsBodySchema = {
         data: {},
         table: { type: "string" },
     },
-    required: ["name", "data"],
+    required: ["name"],
 };
 const editUserClsBodySchema = {
     type: "object",
@@ -48,4 +49,7 @@ export default function plugin(app) {
     if (!app.hasRoute({ method: "DELETE", url: "/api/user-cls/:name" })) {
         app.delete("/user-cls/:name", { config: { policy: "L1" }, schema: { params: userClsParamsSchema } }, deleteUserCls);
     }
+    if (!app.hasRoute({ method: "DELETE", url: "/api/user-cls/:name/:code" })) {
+        app.delete("/user-cls/:name/:code", { config: { policy: "L1" }, schema: { params: userClsParamsSchema } }, deleteUserCls);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "type": "module",
   "description": "core-plugins",
   "keywords": [