@opengis/fastify-table 2.0.153 → 2.0.155

package/dist/server/plugins/crud/funcs/utils/logChanges.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logChanges.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/crud/funcs/utils/logChanges.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AA8C5D,wBAA8B,UAAU,CAAC,EACvC,EAAE,EACF,KAAK,EAAE,MAAM,EACb,SAAS,EACT,OAAO,EACP,EAAE,EACF,IAAI,EACJ,GAAO,EACP,IAAI,GACL,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;CACd;;;;;;;;;;;;;;;;;;;;UAiNA"}
+{"version":3,"file":"logChanges.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/crud/funcs/utils/logChanges.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AA6C5D,wBAA8B,UAAU,CAAC,EACvC,EAAE,EACF,KAAK,EAAE,MAAM,EACb,SAAS,EACT,OAAO,EACP,EAAE,EACF,IAAI,EACJ,GAAO,EACP,IAAI,GACL,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;CACd;;;;;;;;;;;;;;;;;;;;UA4MA"}

package/dist/server/plugins/crud/funcs/utils/logChanges.js

@@ -2,6 +2,8 @@ import { createHash } from "node:crypto";
 import getTemplate from "../../../table/funcs/getTemplate.js";
 import metaFormat from "../../../table/funcs/metaFormat/index.js";
 import getMeta from "../../../pg/funcs/getMeta.js";
+import config from "../../../../../config.js";
+const logLength = +(config.logLength || 200);
 const defaultTitles = {
     editor_date: "Дата оновлення",
     editor_id: "Редактор",
@@ -26,7 +28,7 @@ const systemColumns = [
     "updated_by",
     "created_by",
 ];
-function getValue(val, tableName, columnTypes) {
+function getValue(val, tableName) {
     if (typeof val === "boolean")
         return val;
     if (!val)
@@ -34,7 +36,9 @@ function getValue(val, tableName, columnTypes) {
     if (["crm.files"].includes(tableName)) {
         return typeof val === "object" ? JSON.stringify(val) : val;
     }
-    return typeof val === "object" ? null : val?.toString?.()?.substring?.(0, 30);
+    return typeof val === "object"
+        ? null
+        : val?.toString?.()?.substring?.(0, logLength);
 }
 // extract titles and cls from form schema
 // alt: extract table template from referer -> form
@@ -112,7 +116,7 @@ export default async function logChanges({ pg, table: table1, tokenData, referer
                     [titles[curr] || curr]: columnTypes[curr] === "geometry"
                         ? {}
                         : {
-                            value: getValue(row[curr], table, columnTypes),
+                            value: getValue(row[curr], table),
                             hash: typeof row[curr] === "boolean" || row[curr]
                                 ? createHash("md5")
                                     .update(JSON.stringify(row[curr]))
@@ -123,22 +127,20 @@ export default async function logChanges({ pg, table: table1, tokenData, referer
                 return acc;
             });
         }
-        await Promise.all(Object.keys(row)
+        await Promise.all(Object.keys(row || {})
             .filter((key) => row[key] && columnTypes[key] === "geometry")
             .map(async (key) => pg
-            .query(typeof row[key] === "string" // binary geometry as string via update?
-            ? "select st_asgeojson(st_pointonsurface($1))::json"
-            : "select st_asgeojson(st_pointonsurface(st_geomfromgeojson($1)))::json", [row[key]])
-            .then((el) => ({ key, geometry: el.rows[0].st_asgeojson })))).then((r) => r.forEach((curr) => {
-            const value = curr.geometry.coordinates.join(",");
+            .query("select st_astext($1)", [row[key]])
+            .then((el) => ({ key, value: el.rows[0].st_astext })))).then((r) => r.forEach((curr) => {
+            const { key, value } = curr;
             const hash = createHash("md5")
                 .update(JSON.stringify(value))
                 .digest("hex");
-            if (titles[curr.key]) {
-                newObj1[titles[curr.key]] = { value, hash };
+            if (titles[key]) {
+                newObj1[titles[key]] = { value, hash };
             }
             else {
-                newObj1[curr.key] = { value, hash };
+                newObj1[key] = { value, hash };
             }
         }));
         const changesData = Object.keys(newObj1 || {})

package/dist/server/routes/crud/controllers/insert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAe5C,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAqLjE"}
+{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAe5C,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAyMjE"}

package/dist/server/routes/crud/controllers/insert.js

@@ -130,6 +130,17 @@ export default async function insert(req, reply) {
     if (!res) {
         return reply.status(400).send({ error: "nothing added", code: 400 });
     }
+    const pk = pg.pk?.[loadTemplate?.table || table];
+    const id = res[pk];
+    if (Array.isArray(body.files)) {
+        await Promise.all(body.files
+            .filter((el) => el.file_id && el.file_path)
+            .map(async (el) => pg.query("update crm.files set entity_id=$1 where entity_id = 'uploads' and file_id=$2 and file_path=$3", [id, el.file_id, el.file_path])));
+    }
+    // remove stale files
+    // await pg.query(
+    //   "delete from crm.files where entity_id = 'uploads' and cdate  < now() - interval '1 day'"
+    // );
     // admin.custom_column
     await applyHook("afterInsert", {
         pg,
@@ -139,8 +150,7 @@ export default async function insert(req, reply) {
         payload: res,
         user,
     });
-    const pk = pg.pk?.[loadTemplate?.table || table];
     return reply
         .status(200)
-        .send({ id: res?.rows?.[0]?.[pk], rows: res.rows, extra: res.extra, ...(res.rows?.[0] || {}) });
+        .send({ id, rows: res.rows, extra: res.extra, ...(res || {}) });
 }

package/dist/server/routes/widget/controllers/widget.get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"widget.get.d.ts","sourceRoot":"","sources":["../../../../../server/routes/widget/controllers/widget.get.ts"],"names":[],"mappings":"AAyBA;;;GAGG;AAEH,wBAA8B,SAAS,CACrC,EAAE,EAAqB,EAAE,IAAS,EAAE,MAAW,EAAE,KAAU,EAAE,EAAE,GAAG,EAClE,KAAK,EAAE,GAAG,gBA+KX"}
+{"version":3,"file":"widget.get.d.ts","sourceRoot":"","sources":["../../../../../server/routes/widget/controllers/widget.get.ts"],"names":[],"mappings":"AAyBA;;;GAGG;AAEH,wBAA8B,SAAS,CACrC,EAAE,EAAqB,EAAE,IAAS,EAAE,MAAW,EAAE,KAAU,EAAE,EAAE,GAAG,EAClE,KAAK,EAAE,GAAG,gBAyLX"}

package/dist/server/routes/widget/controllers/widget.get.js

@@ -124,7 +124,9 @@ export default async function widgetGet({ pg = pgClients.client, user = {}, para
         !process.env.VITEST) {
         return reply.status(404).send("log table not found");
     }
-    const q1 = `select ${username} as author, u.login, a.cdate, a.editor_date from ${tableName} a 
+    const cdateColumn = columns.find((col) => ["cdate", "created_at"].includes(col.name))?.name;
+    const editorDateColumn = columns.find((col) => ["editor_date", "updated_at"].includes(col.name))?.name;
+    const q1 = `select ${username} as author, u.login ${cdateColumn ? `,a.${cdateColumn} as cdate` : ""} ${editorDateColumn ? `,a.${editorDateColumn} as editor_date` : ""} from ${tableName} a 
   left join admin.users u on a.${authorIdColumn}=u.uid where a.${pk}=$1 limit 1`;
     const data = pg.pk["admin.users"] && pk && tableName
         ? await pg

package/package.json

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