@opengis/admin 0.2.85 → 0.2.87

package/server/routes/properties/utils/refreshData.js

@@ -0,0 +1,128 @@
+import { randomUUID, createHash } from 'crypto';
+
+import { dataInsert, pgClients } from '@opengis/fastify-table/utils.js';
+
+function prepareResult(res) {
+  const arr = (res.rows || (Array.isArray(res) ? res : Object.values(res || {})));
+  return {
+    command: 'INSERT',
+    count: arr.filter((el) => el.command === 'INSERT')
+      ?.map((el) => ({ result: 'success', count: el.rowCount }))
+      ?.reduce((acc, curr) => acc + curr.count, 0),
+  };
+}
+
+export default async function refreshData({
+  pg = pgClients.client, entity, table, uid, data,
+}) {
+  if (!['filter', 'column', 'customQuery', 'customColumn'].includes(entity)) {
+    return { message: 'invalid params: entity', status: 400 };
+  }
+
+  const client = await pg.connect();
+
+  /* getMeta support */
+  client.options = pg.options;
+  client.tlist = pg.tlist;
+  client.pgType = pg.pgType;
+  client.pk = pg.pk;
+  client.relkinds = pg.relkinds;
+
+  const result = {};
+
+  try {
+    await client.query('BEGIN');
+
+    if (['filter', 'column'].includes(entity)) {
+      data?.forEach((el) => Object.assign(el, { id: el.id || randomUUID() }));
+      await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
+
+      const res = dataInsert({
+        pg: client,
+        table: 'setting.property',
+        data: {
+          property_entity: entity,
+          object_id: table,
+          property_json: JSON.stringify(data)?.replace(/'/g, "''"),
+        },
+        uid,
+      });
+      Object.assign(result, res);
+    }
+
+    if (['customQuery'].includes(entity)) {
+      await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
+
+      const res = await Promise.all(data?.map(async (el) => dataInsert({
+        pg: client,
+        table: 'setting.property',
+        data: {
+          property_entity: entity,
+          object_id: table,
+          property_key: el.name,
+          property_text: el.query,
+          property_json: { disabled: el.disabled },
+        },
+        uid,
+      })));
+      Object.assign(result, res);
+    }
+
+    if (entity === 'customColumn') {
+      const prefix = createHash('md5').update(table).digest('hex').substr(0, 10);
+      const data1 = [];
+
+      await Promise.all(data.map(async (el, index) => {
+        const obj = {
+          cf_id: `col_${prefix}_${index}`,
+          cf_name: el.title || el.ua || el.name,
+          cf_type: el.format || el.type,
+          cf_default: el.default,
+          cf_notnull: el.notnull,
+          object_id: table,
+          tablename: table,
+        };
+
+        data1.push({
+          name: obj.cf_id,
+          title: obj.cf_name,
+          format: obj.cf_type,
+          option: data[index]?.option,
+          hidden: data[index]?.hidden,
+          custom: true,
+        });
+
+        await dataInsert({
+          pg: client,
+          table: 'setting.custom_field',
+          data: obj,
+          uid,
+        });
+      }));
+
+      await client.query('delete from setting.custom_field where $1 in (tablename, object_id)', [table]);
+      await client.query('delete from setting.property where object_id=$1 and property_entity=$2', [table, entity]);
+
+      const data2 = JSON.stringify(data1?.filter((value, index, array) => array.indexOf(value) === index))?.replace(/'/g, "''");
+      const res = await dataInsert({
+        pg: client,
+        table: 'setting.property',
+        data: {
+          property_entity: 'customColumn',
+          object_id: table,
+          property_json: data2,
+        },
+        uid,
+      });
+      Object.assign(result, res);
+    }
+    await client.query('COMMIT');
+    return prepareResult(result);
+  } catch (err) {
+    await client.query('ROLLBACK');
+    return { error: err.toString(), status: 500 };
+  }
+  finally {
+    client.release();
+  }
+};

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

@@ -1,7 +1,7 @@
 import { getMeta, getToken, pgClients } from '@opengis/fastify-table/utils.js';
 
 const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
-const username = `coalesce(u.sur_name,'')||coalesce(' '||u.user_name,'') ||coalesce(' '||u.father_name,'') as username`;
+const username = `coalesce(u.sur_name,'')||coalesce(' '||u.user_name,'') ||coalesce(' '||u.father_name,'')`;
 
 /**
  * Дістає CRM для widget
@@ -85,6 +85,7 @@ export default async function widgetGet({
 
   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 data = pk && q ? await pg.one(q, [objectid]) : {};
 
   if (query.debug && user?.user_type === 'admin') {

package/server/templates/setting/test.json

@@ -0,0 +1,20 @@
+{
+    "login": {
+        "ru": "Логин",
+        "type": "Text",
+        "ua": "Логін"
+    },
+    "password": {
+        "ru": "Пароль",
+        "type": "Password",
+        "ua": "Пароль",
+        "validators": [
+            {
+                "flags": "gm",
+                "message": "Пароль повинен бути більше 8 символів",
+                "regexp": "^.{8,}$",
+                "type": "regexp"
+            }
+        ]
+    }
+}