@opengis/fastify-table 1.2.1 → 1.2.3

package/package.json

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

package/server/migrations/0.sql

@@ -35,8 +35,8 @@ if (_returnType != 'text') then
 
 	DROP FUNCTION IF EXISTS next_id();
 
-	CREATE EXTENSION if not exists "uuid-ossp";
-	ALTER EXTENSION "uuid-ossp" SET SCHEMA public;
+	/* CREATE EXTENSION if not exists "uuid-ossp";
+	ALTER EXTENSION "uuid-ossp" SET SCHEMA public; */
 
 	CREATE OR REPLACE FUNCTION next_id()
 	  RETURNS text AS
@@ -44,7 +44,9 @@ if (_returnType != 'text') then
 	DECLARE
 
 	BEGIN
-	    return replace(public.uuid_generate_v4()::text, '-', '');
+	    -- return replace(public.uuid_generate_v4()::text, '-', '');
+		-- return replace(gen_random_uuid()::text, '-', ''); -- native from postgres 13 onward
+		return encode(public.gen_random_bytes(6), 'hex');
 	END;
 	$BODY$
 	  LANGUAGE plpgsql VOLATILE
@@ -61,8 +63,8 @@ if (_returnType != 'text') then
 else 
 	raise notice 'skip default reassign';
 
-		CREATE EXTENSION if not exists "uuid-ossp";
-		ALTER EXTENSION "uuid-ossp" SET SCHEMA public;
+		/* CREATE EXTENSION if not exists "uuid-ossp";
+		ALTER EXTENSION "uuid-ossp" SET SCHEMA public; */
 
 	CREATE OR REPLACE FUNCTION next_id()
 	  RETURNS text AS
@@ -70,7 +72,9 @@ else
 	DECLARE
 
 	BEGIN
-	    return replace(public.uuid_generate_v4()::text, '-', '');
+	    -- return replace(public.uuid_generate_v4()::text, '-', '');
+		-- return replace(gen_random_uuid()::text, '-', ''); -- native from postgres 13 onward
+		return encode(public.gen_random_bytes(6), 'hex');
 	END;
 	$BODY$
 	  LANGUAGE plpgsql VOLATILE

package/server/plugins/crud/funcs/dataDelete.js

@@ -11,9 +11,10 @@ export default async function dataDelete({
 }) {
   const pg = pg1 || getPG({ name: 'client' });
   const { pk } = await getMeta({ pg, table });
-  if (!pg.tlist?.includes(table)) return 'table not exist';
+  const table1 = table.replace(/"/g, '');
+  if (!pg.tlist?.includes(table1)) return 'table not exist';
   const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
-  //  console.log(updateDataset);
+
   const res = await pg.query(delQuery, [id]).then(el => el.rows?.[0] || {});
   await logChanges({
     pg, table, tokenData, referer, id, uid, type: 'DELETE',

package/server/plugins/crud/funcs/dataInsert.js

@@ -36,8 +36,16 @@ export default async function dataInsert({
 
   const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
 
+  const table1 = pg.pk[table] ? table : table.replace(/"/g, '');
   await logChanges({
-    pg, table, tokenData, referer, data, id: res.rows?.[0]?.[pg.pk[table]], uid, type: 'INSERT',
+    pg,
+    table,
+    tokenData,
+    referer,
+    data,
+    id: res.rows?.[0]?.[pg.pk[table1]],
+    uid,
+    type: 'INSERT',
   });
 
   rclient.incr(`pg:${table}:crud`);

package/server/plugins/crud/funcs/getAccess.js

@@ -56,12 +56,17 @@ export default async function getAccess({ table, user = {} }) {
     return { actions: [], query: '1=1' };
   }
 
-  const userAccess = await pgClients.client.query(q, [table, uid])
-    .then(el => ({
-      ...el.rows[0] || {},
-      roles: el.rows?.map?.(row => row.role_id) || [],
-      actions: el.rows?.map?.(row => row.actions).flat() || [],
-    }));
+  const userAccess = pgClients.client?.pk?.['admin.routes']
+    && pgClients.client?.pk?.['admin.role_access']
+    && pgClients.client?.pk?.['admin.roles']
+    && pgClients.client?.pk?.['admin.user_roles']
+    ? await pgClients.client.query(q, [table, uid])
+      .then(el => ({
+        ...el.rows[0] || {},
+        roles: el.rows?.map?.(row => row.role_id) || [],
+        actions: el.rows?.map?.(row => row.actions).flat() || [],
+      }))
+    : {};
 
   const query = userAccess?.scope === 'my' ? `uid='${uid}'` : '1=1';
   const actions = userAccess?.actions?.filter?.((el, idx, arr) => arr.indexOf(el) === idx && tableActions.includes(el));

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

@@ -1,6 +1,18 @@
 import getTemplate from '../../..//table/funcs/getTemplate.js';
 import { metaFormat } from '@opengis/fastify-table/utils.js';
 
+const defaultTitles = {
+  // editor_date: 'Дата оновлення',
+  // editor_id: 'Редактор',
+  // сdate: 'Дата створення',
+  // uid: 'Автор',
+  body: 'Зміст',
+  // entity_id: 'ID Сутності',
+  // entity_type: 'Таблиця сутності',
+  file_path: 'Шлях до файлу',
+  uploaded_name: 'Назва файлу',
+};
+
 function getValue(val) {
   if (!val) return null;
   return typeof val === 'object'
@@ -11,8 +23,9 @@ function getValue(val) {
 // extract titles and cls from form schema
 // alt: extract table template from referer -> form
 export default async function logChanges({
-  pg, table, tokenData, referer, id, data, uid = 1, type,
+  pg, table: table1, tokenData, referer, id, data, uid = 1, type,
 }) {
+  const table = table1.replace(/"/g, '');
   if (!id) {
     console.error('param id is required');
     return null;
@@ -66,10 +79,10 @@ export default async function logChanges({
       await metaFormat({ rows: [data], cls, sufix: false });
     }
 
-    const newObj = Object.fromEntries(Object.entries(data || {}).map(el => ([[titles[el[0]] || el[0]], el[1]])));
+    const newObj = Object.fromEntries(Object.entries(data || {}).map(el => ([[titles[el[0]] || defaultTitles[el[0]] || el[0]], el[1]])));
     const changesData = Object.keys(newObj || {}).map(el => ({
       change_id: changeId,
-      entity_key: titles[el[0]] || el,
+      entity_key: el,
       value_old: getValue(old?.[el]),
       value_new: type === 'DELETE' ? null : getValue(newObj?.[el]),
       uid,