@opengis/admin 0.3.84 → 0.3.86

package/dist/{profile-page-BvH-kg6j.js → profile-page-BJ0Mf6C2.js}

@@ -1,4 +1,4 @@
-import { _ as n, g as m } from "./import-file-DoXCXa-Q.js";
+import { _ as n, g as m } from "./import-file-CrENtq-3.js";
 import { u as p } from "./user-B_2kh6ic.js";
 import { resolveComponent as d, openBlock as u, createElementBlock as f, createElementVNode as o, createBlock as h, createCommentVNode as b } from "vue";
 const x = {

package/package.json

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

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

@@ -88,35 +88,41 @@ export default async function widgetGet({
 
   };
 
-  const sql = sqls[params.type];
+  const q = sqls[params.type];
 
-  if (!sql) {
+  if (!q) {
     return reply.status(400).send('invalid widget type');
   }
 
 
   /* data */
   const time = [Date.now()];
-  const { rows = [] } = await pg.query(sql, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el));
+  const { rows = [] } = await pg.query(q, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el));
   rows.forEach(row => Object.assign(row, { username: row.username?.trim?.() || row.login }));
   time.push(Date.now());
 
   /* Object info  */
-  const { tableName } = pg.pk['log.table_changes'] ? await pg.query('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid]).then(el => el.rows?.[0] || {}) : {};
-  const { pk } = await getMeta({ pg, table: tableName });
+  const { tableName } = pg.pk['log.table_changes'] ? await pg.query(
+    'select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1',
+    [objectid]
+  ).then(el => el.rows?.[0] || {}) : {};
+
+  const { pk, columns = [] } = await getMeta({ pg, table: tableName });
+
+  const authorIdColumn = columns.find(col => ['uid', 'created_by'].includes(col.name))?.name;
 
   if (!pk && params.type === 'history' && !unittest) {
     return reply.status(404).send('log table not found');
   }
 
-  const q = tableName && pg.pk['admin.users'] ? `select ${username} as author, u.login, a.cdate, a.editor_date from ${tableName} a 
-  left join admin.users u on a.uid=u.uid where a.${pk}=$1 limit 1` : undefined;
+  const q1 = `select ${username} as author, u.login, a.cdate, a.editor_date from ${tableName} a 
+  left join admin.users u on a.${authorIdColumn}=u.uid where a.${pk}=$1 limit 1`;
 
-  const data = pk && q ? await pg.query(q, [objectid]).then(el => el.rows?.[0] || {}) : {};
+  const data = pg.pk['admin.users'] && pk && tableName ? await pg.query(q, [objectid]).then(el => el.rows?.[0] || {}) : {};
 
   if (query.debug && user?.user_type === 'admin') {
     return {
-      sql, type: params.type, q, id: objectid, data,
+      q, type: params.type, q1, id: objectid, data,
     };
   }