@opengis/fastify-table 1.2.58 → 1.2.59

package/package.json

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

package/server/migrations/properties.sql

@@ -53,8 +53,8 @@ ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_title text;
 COMMENT ON COLUMN admin.user_properties.property_title IS 'Назва';
 
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS private boolean;
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS private SET NOT NULL;
-ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS private boolean default SET default true;
+ALTER TABLE admin.user_properties ALTER COLUMN private SET NOT NULL;
+ALTER TABLE admin.user_properties ALTER COLUMN private SET default true;
 COMMENT ON COLUMN admin.user_properties.private IS 'Доступ лише для користувача, який додав дане налаштування';
 
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;

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

@@ -5,6 +5,7 @@ import config from '../../../../../config.js';
 export default function getFolder(req, type = 'server') {
   if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
   const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
-  const filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, req.folder || config.folder || '');
+  const dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params
+  const filepath = path.posix.join(types[type] || `/data/local/${dbname || ''}`, req.folder || config.folder || '');
   return filepath;
 }

package/server/routes/table/controllers/filter.js

@@ -42,15 +42,16 @@ export default async function filterAPI(req) {
       logger.file('autoindex/error', { name: params?.name, error: err.toString(), stack: err.stack });
     });
 
-  await Promise.all(filters.filter((el) => el.data && (el.id || el.name)).map(async (el) => {
-    const name = el.id || el.name;
+  filters?.forEach?.(el => Object.assign(el, { id: el.id || el.name }));
+
+  await Promise.all(filters.filter((el) => el.data && el.id).map(async (el) => {
     const cls = await getSelect(el.data, pg);
 
     if (!cls || !loadTable.table) return;
-    const { dataTypeID } = columns.find((item) => item.name === name) || {};
+    const { dataTypeID } = columns.find((item) => item.name === el.id) || {};
 
     if (el.extra && el.type === 'select' && Array.isArray(cls)) {
-      const countArr = await pg.query(`select value_text as id, count(*) from crm.extra_data where property_key=$1 and property_entity=$2 group by value_text`, [name, params.table]);
+      const countArr = await pg.query(`select value_text as id, count(*) from crm.extra_data where property_key=$1 and property_entity=$2 group by value_text`, [el.id, params.table]);
       const options = countArr.rows.map(cel => {
         const data = cls.find(c => c.id === cel.id);
         return { ...cel, ...data };
@@ -59,8 +60,8 @@ export default async function filterAPI(req) {
     }
 
     const countArr = pg.pgType[dataTypeID]?.includes('[]')
-      ? await pg.queryCache(`select unnest(${name})::text as id,count(*) from (${optimizedSQL})q group by unnest(${name})`, { table: loadTable.table, time: 5 })
-      : await pg.queryCache(`select ${name}::text as id,count(*) from (${optimizedSQL})q group by ${name}`, { table: loadTable.table, time: 5 });
+      ? await pg.queryCache(`select unnest(${el.id})::text as id,count(*) from (${optimizedSQL})q group by unnest(${el.id})`, { table: loadTable.table, time: 5 })
+      : await pg.queryCache(`select ${el.id}::text as id,count(*) from (${optimizedSQL})q group by ${el.id}`, { table: loadTable.table, time: 5 });
     const ids = countArr.rows.map(el1 => el1.id);
 
     const clsData = await getSelectVal({ pg, values: ids, name: el.data });