@opengis/fastify-table 1.1.74 → 1.1.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.74",
+  "version": "1.1.75",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/server/migrations/roles.sql

@@ -103,40 +103,40 @@ CREATE INDEX IF NOT EXISTS admin_user_roles_role_id_idx ON admin.user_roles USIN
 
 
 -- Route (Interface) <> User / Role (Group)
--- drop table if exists admin.access;
-CREATE TABLE if not exists admin.access();
-alter table admin.access DROP CONSTRAINT if exists admin_access_id_pkey;
-alter table admin.access DROP CONSTRAINT if exists admin_access_role_id_fkey;
-alter table admin.access DROP CONSTRAINT if exists admin_access_route_id_uid_unique;
-alter table admin.access DROP CONSTRAINT if exists admin_access_route_id_fkey;
-
-alter table admin.access add column if not exists access_id text NOT NULL DEFAULT next_id();
-alter table admin.access add column if not exists route_id text NOT NULL;
-alter table admin.access add column if not exists role_id text;
-alter table admin.access add column if not exists user_uid text;
-alter table admin.access add column if not exists scope text;
-alter table admin.access add column if not exists actions text[];
-ALTER TABLE admin.access ADD COLUMN IF NOT EXISTS access_granted text;
-ALTER TABLE admin.access ADD COLUMN IF NOT EXISTS access_granted_time timestamp without time zone;
-alter table admin.access add column if not exists cdate timestamp without time zone NOT NULL DEFAULT date_trunc('seconds'::text, now());
-alter table admin.access add column if not exists uid text;
-alter table admin.access add column if not exists editor_id text;
-alter table admin.access add column if not exists editor_date timestamp without time zone;
-
-alter table admin.access 
+-- drop table if exists admin.role_access;
+CREATE TABLE if not exists admin.role_access();
+alter table admin.role_access DROP CONSTRAINT if exists admin_access_id_pkey;
+alter table admin.role_access DROP CONSTRAINT if exists admin_access_role_id_fkey;
+alter table admin.role_access DROP CONSTRAINT if exists admin_access_route_id_uid_unique;
+alter table admin.role_access DROP CONSTRAINT if exists admin_access_route_id_fkey;
+
+alter table admin.role_access add column if not exists access_id text NOT NULL DEFAULT next_id();
+alter table admin.role_access add column if not exists route_id text NOT NULL;
+alter table admin.role_access add column if not exists role_id text;
+alter table admin.role_access add column if not exists user_uid text;
+alter table admin.role_access add column if not exists scope text;
+alter table admin.role_access add column if not exists actions text[];
+ALTER TABLE admin.role_access ADD COLUMN IF NOT EXISTS access_granted text;
+ALTER TABLE admin.role_access ADD COLUMN IF NOT EXISTS access_granted_time timestamp without time zone;
+alter table admin.role_access add column if not exists cdate timestamp without time zone NOT NULL DEFAULT date_trunc('seconds'::text, now());
+alter table admin.role_access add column if not exists uid text;
+alter table admin.role_access add column if not exists editor_id text;
+alter table admin.role_access add column if not exists editor_date timestamp without time zone;
+
+alter table admin.role_access 
 add CONSTRAINT admin_access_id_pkey PRIMARY KEY (access_id);
 
-COMMENT ON TABLE admin.access IS 'Налаштування прав. Відношення груп / окремих користувачів до шаблонів';
-COMMENT ON COLUMN admin.access.route_id IS 'ID шаблона';
-COMMENT ON COLUMN admin.access.role_id IS 'ID групи';
-COMMENT ON COLUMN admin.access.user_uid IS 'ID користувача';
-COMMENT ON COLUMN admin.access.scope IS 'Обмеження виведення (власні, відповідальний, всі)';
-COMMENT ON COLUMN admin.access.actions IS 'Доступні дії';
-COMMENT ON COLUMN admin.access.access_granted IS 'Ідентифікатор користувача який надав доступ';
-COMMENT ON COLUMN admin.access.access_granted_time IS 'Час коли надали доступ';
+COMMENT ON TABLE admin.role_access IS 'Налаштування прав. Відношення груп / окремих користувачів до шаблонів';
+COMMENT ON COLUMN admin.role_access.route_id IS 'ID шаблона';
+COMMENT ON COLUMN admin.role_access.role_id IS 'ID групи';
+COMMENT ON COLUMN admin.role_access.user_uid IS 'ID користувача';
+COMMENT ON COLUMN admin.role_access.scope IS 'Обмеження виведення (власні, відповідальний, всі)';
+COMMENT ON COLUMN admin.role_access.actions IS 'Доступні дії';
+COMMENT ON COLUMN admin.role_access.access_granted IS 'Ідентифікатор користувача який надав доступ';
+COMMENT ON COLUMN admin.role_access.access_granted_time IS 'Час коли надали доступ';
 
-CREATE INDEX if not exists admin_access_route_id_idx ON admin.access USING btree (route_id COLLATE pg_catalog."default");
-CREATE INDEX if not exists admin_access_role_id_idx ON admin.access USING btree (role_id COLLATE pg_catalog."default");
+CREATE INDEX if not exists admin_access_route_id_idx ON admin.role_access USING btree (route_id COLLATE pg_catalog."default");
+CREATE INDEX if not exists admin_access_role_id_idx ON admin.role_access USING btree (role_id COLLATE pg_catalog."default");
 
 -- Admin Menu
 -- DROP TABLE if exists admin.menu;
@@ -161,13 +161,13 @@ COMMENT ON COLUMN admin.menu.name IS 'Назва пункту меню';
 COMMENT ON COLUMN admin.menu.ord IS 'Порядковий номер';
 COMMENT ON COLUMN admin.menu.enabled IS 'On / Off';
 
-alter table admin.access 
+alter table admin.role_access 
 add CONSTRAINT admin_access_role_id_fkey FOREIGN KEY (role_id) REFERENCES admin.roles (role_id);
 alter table admin.routes add constraint admin_route_menu_id_fkey FOREIGN KEY (menu_id) REFERENCES admin.menu(menu_id);
 
-alter table admin.access 
+alter table admin.role_access 
 add CONSTRAINT admin_access_route_id_uid_unique UNIQUE (route_id, user_uid, role_id);
-alter table admin.access 
+alter table admin.role_access 
 add constraint admin_access_route_id_fkey FOREIGN KEY (route_id) REFERENCES admin.routes(route_id);
 alter table admin.menu add CONSTRAINT admin_menu_name_unique UNIQUE (name);
 ALTER TABLE admin.user_roles ADD CONSTRAINT admin_user_roles_user_role_id_fkey FOREIGN KEY (role_id) REFERENCES admin.roles (role_id);

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

@@ -8,7 +8,7 @@ import applyHook from '../../hook/funcs/applyHook.js';
 
 const q = `select a.route_id as id, coalesce(b.actions,array['get']) as actions, b.scope 
 from admin.routes a 
-left join admin.access b on 
+left join admin.role_access b on 
   a.route_id=b.route_id
 left join admin.roles c on 
   b.role_id=c.role_id 

package/server/plugins/logger/getLogger.js

@@ -19,7 +19,13 @@ const options = {
   transport: {
     targets: [{
       target: './createFileStream.js', // path.resolve('utils/createFileStream.js')
-    }],
+    },
+    {
+      level: 'error',
+      target: 'pino/file',
+      options: { destination: 1 },
+    },
+    ],
   },
 };
 const logger = pino(options);

package/server/plugins/table/funcs/getSelectMeta.js

@@ -16,14 +16,16 @@ export default async function getSelectMeta({ name, pg = pgClients.client, nocac
   const { sql: original } = cls;
   if (!original.toLowerCase) { console.log(`sql select null: ${name}`); return null; }
 
-  const sql = `with c(id,text) as (${original} ) select * from c  `;
+  const sql = `with c(id,text) as (${original} ) select * from c`;
+  // large query > slow with() w/o limit
+  const sql1 = `with c(id,text) as (select * from (${original})q limit 0) select * from c`;
 
   /*= == meta table === */
 
   const tableNew = original.toLowerCase().replace(/\n/g, ' ').split(' from ').filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
     .map((el) => el.split(/[ )]/)[0].replace(/[\r\n]+/g, ''));
 
-  const dataOrigin = await pg.query(`${sql} limit 0`);
+  const dataOrigin = await pg.query(`${sql1} limit 0`);
 
   const dataOrigin1 = await pg.query(`${original} limit 0`);
 

package/server/plugins/table/funcs/metaFormat/getSelectVal.js

@@ -10,15 +10,12 @@ export default async function getSelectVal({ pg = pgClients.client, name, values
   const key = `select:${name}`;
   const cache = !cls.arr ? (await redis.hmget(key, values)).reduce((p, el, i) => ({ ...p, [values[i]]: el }), {}) : {};
 
-  const id = cls?.sql?.toLowerCase()?.split(',')?.shift()?.split(' ')
-    ?.pop();
-  const q = `with c(id,text) as (select * from (${cls.sql})q where ${id} = any('{${values.filter(el => !cache[el])}}')) select * from c`;
-  const data = cls.arr || (values.filter(el => !cache[el]).length
-    ? await pg.query(q).then(el => el.rows)
-    : []);
+  const { name: id } = cls?.sql ? await pg.queryCache(`select * from (${cls.sql})q limit 0`).then((res) => res.fields?.[0] || {}) : {};
+  const q = cls?.sql ? `with c(id,text) as (select * from (${cls.sql})q where ${id} = any('{${values.filter(el => !cache[el])}}')) select * from c` : '';
+  const data = (cls.sql && values.filter(el => !cache[el]).length ? await pg.query(q).then(el => el.rows) : cls?.arr?.filter((el) => values.filter(el => !cache[el])?.includes(el?.id))) || [];
 
   const clsAr = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };
-  if (!cls.arr && data.length) {
+  if (!cls.arr && data?.length) {
     redis.hmset(key, clsAr);
   }
   return clsAr;