@opengis/admin 0.2.148 → 0.2.149

package/package.json

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

package/server/routes/user/controllers/user.cls.js

@@ -1,11 +1,11 @@
-import { readFile } from 'fs/promises';
-import { getTemplatePath } from '@opengis/fastify-table/utils.js';
+import { readFile } from 'node:fs/promises';
+import { getTemplatePath, pgClients } from '@opengis/fastify-table/utils.js';
 
 export default async function userCls(req) {
   const {
-    pg, params = {}, query = {}, session = {},
+    pg = pgClients.client, params = {}, query = {}, user = {},
   } = req;
-  const { uid } = session.passport?.user || {};
+  const { uid } = user || {};
 
   if (!uid) {
     return { message: 'access restricted', status: 403 };
@@ -18,7 +18,7 @@ export default async function userCls(req) {
   const q = `select user_clsid as id, name, type, 
   case when type='json' then (
       ${params?.id
-    ? `(with recursive rows as (
+      ? `(with recursive rows as (
         select user_clsid, code as id, name as text, icon, color, parent
         from admin.user_cls a
         where name=u.name
@@ -28,7 +28,7 @@ export default async function userCls(req) {
         join rows b on a.parent=b.text
       ) select json_agg(row_to_json(q)) from rows q where text<>u.name
      )`
-    : 'select count(*)::int from admin.user_cls where parent=u.name'} ) else null end as children, 
+      : 'select count(*)::int from admin.user_cls where parent=u.name'} ) else null end as children, 
       case when type='sql' then data else null end as sql from admin.user_cls u
     where (case when type='json' then parent is null else true end)
     and uid=(select uid from admin.users where $1 in (login,uid) limit 1)
@@ -37,35 +37,35 @@ export default async function userCls(req) {
   if (query?.sql) return q;
 
 
-    const { rows = [] } = await pg.query(q, [uid, params.id].filter((el) => el));
+  const { rows = [] } = await pg.query(q, [uid, params.id].filter((el) => el));
 
-    rows.forEach((row) => {
-      if (row.type === 'sql') delete row.children;
-      if (row.type === 'json') { delete row.sql; Object.assign(row, { children: row.children || (params?.id ? [] : 0) }); }
-    });
+  rows.forEach((row) => {
+    if (row.type === 'sql') delete row.children;
+    if (row.type === 'json') { delete row.sql; Object.assign(row, { children: row.children || (params?.id ? [] : 0) }); }
+  });
 
-    const clsList = query.type === 'sql' ? [] : getTemplatePath('cls'); // skip cls if type sql
-    const selectList = query.type === 'json' ? [] : getTemplatePath('select'); // skip sql if type json
+  const clsList = query.type === 'sql' ? [] : getTemplatePath('cls'); // skip cls if type sql
+  const selectList = query.type === 'json' ? [] : getTemplatePath('select'); // skip sql if type json
 
-    const userClsNames = rows.map((el) => el.name);
-    const selectNames = selectList.map((el) => el[0]);
+  const userClsNames = rows.map((el) => el.name);
+  const selectNames = selectList.map((el) => el[0]);
 
-    const arr = (clsList || []).concat(selectList || []).map((el) => ({ name: el[0], path: el[1], type: el[2] }))
-      ?.filter((el) => (params?.id ? el.name === params?.id : true))
-      ?.filter((el) => ['sql', 'json'].includes(el?.type) && !userClsNames.includes(el.name))
-      ?.filter((el) => (el?.type === 'json' ? !selectNames?.includes(el?.name) : true));
+  const arr = (clsList || []).concat(selectList || []).map((el) => ({ name: el[0], path: el[1], type: el[2] }))
+    ?.filter((el) => (params?.id ? el.name === params?.id : true))
+    ?.filter((el) => ['sql', 'json'].includes(el?.type) && !userClsNames.includes(el.name))
+    ?.filter((el) => (el?.type === 'json' ? !selectNames?.includes(el?.name) : true));
 
-    const res = await Promise.all(arr?.map(async (el) => {
-      const type = { json: 'cls', sql: 'select' }[el.type] || el.type;
-      // const clsData = await getSelect(type, el.name);
-      const str = await readFile(el.path, 'utf-8');
-      const clsData = type === 'cls' ? JSON.parse(str) : str;
-      if (type === 'cls') {
-        const children = params?.id ? clsData : clsData?.length || 0;
-        return { name: el.name, type: el.type, children };
-      }
-      return { name: el.name, type: el.type, sql: clsData?.sql || clsData };
-    }));
+  const res = await Promise.all(arr?.map(async (el) => {
+    const type = { json: 'cls', sql: 'select' }[el.type] || el.type;
+    // const clsData = await getSelect(type, el.name);
+    const str = await readFile(el.path, 'utf-8');
+    const clsData = type === 'cls' ? JSON.parse(str) : str;
+    if (type === 'cls') {
+      const children = params?.id ? clsData : clsData?.length || 0;
+      return { name: el.name, type: el.type, children };
+    }
+    return { name: el.name, type: el.type, sql: clsData?.sql || clsData };
+  }));
 
-    return { message: { rows: rows.concat(res) }, status: 200 };
+  return { message: { rows: rows.concat(res) }, status: 200 };
 }

package/server/routes/user/controllers/user.cls.post.js

@@ -1,7 +1,9 @@
+import { pgClients } from "@opengis/fastify-table/utils.js";
+
 export default async function userClsPost({
-  pg, body = {}, session = {},
+  pg = pgClients.client, body = {}, user = {},
 }) {
-  const { uid } = session.passport?.user || {};
+  const { uid } = user || {};
   const {
     name, type = 'json', children = [], sql,
   } = body;
@@ -23,7 +25,7 @@ export default async function userClsPost({
   }
 
 
-    const { rowCount = 0 } = await pg.query(`with recursive rows as (
+  const { rowCount = 0 } = await pg.query(`with recursive rows as (
       select user_clsid, name, code, icon, color, parent
       from admin.user_cls a
       where name=$1
@@ -32,21 +34,21 @@ export default async function userClsPost({
       from admin.user_cls a
       join rows b on a.parent=b.name
     ) delete from admin.user_cls where user_clsid in (select user_clsid from rows )`, [name]);
-    console.log('delete old user cls', name, rowCount);
+  console.log('delete old user cls', name, rowCount);
 
-    const { id, data } = await pg.query('insert into admin.user_cls(name,type,data,uid) values($1,$2,$3,$4) returning user_clsid as id, data', [name, type, sql, uid])
-      .then((res) => res.rows?.[0] || {});
-    if (type === 'json' && children?.length) {
-      if (!id) { return { error: 'insert user cls error', status: 500 }; }
-      const q1 = `insert into admin.user_cls(code,name,color,icon,parent,uid)
+  const { id, data } = await pg.query('insert into admin.user_cls(name,type,data,uid) values($1,$2,$3,$4) returning user_clsid as id, data', [name, type, sql, uid])
+    .then((res) => res.rows?.[0] || {});
+  if (type === 'json' && children?.length) {
+    if (!id) { return { error: 'insert user cls error', status: 500 }; }
+    const q1 = `insert into admin.user_cls(code,name,color,icon,parent,uid)
       
       select value->>'id',value->>'text',value->>'color',value->>'icon', '${name.replace(/'/g, "''")}', '${uid}'
       from json_array_elements('${JSON.stringify(children).replace(/'/g, "''")}'::json)
       
       returning user_clsid as id, code, name, parent`;
-      const { rows = [] } = await pg.query(q1);
-      return { id, name, type, children: rows };
-    }
-    return { id, name, type, data };
+    const { rows = [] } = await pg.query(q1);
+    return { id, name, type, children: rows };
+  }
+  return { id, name, type, data };
 
 }