@opengis/admin 0.2.8 → 0.2.9

package/server/routes/properties/index.mjs

@@ -1,14 +1,14 @@
-import getAdminProperties from './controllers/admin.properties.get.js';
-import postAdminProperties from './controllers/admin.properties.post.js';
-
-import getUserProperties from './controllers/user.properties.get.js';
-import postUserProperties from './controllers/user.properties.post.js';
-
-import { propertiesSchema } from './schema.js';
-
-export default async function route(fastify) {
-  fastify.get('/admin-properties/:key?', {  scheme: propertiesSchema }, getAdminProperties);
-  fastify.get('/user-properties/:key?', { scheme: propertiesSchema }, getUserProperties);
-  fastify.post('/admin-properties', { config: { policy: ['superadmin'] } }, postAdminProperties);
-  fastify.post('/user-properties',  postUserProperties);
-}
+import getAdminProperties from './controllers/admin.properties.get.js';
+import postAdminProperties from './controllers/admin.properties.post.js';
+
+import getUserProperties from './controllers/user.properties.get.js';
+import postUserProperties from './controllers/user.properties.post.js';
+
+import { propertiesSchema } from './schema.js';
+
+export default async function route(fastify) {
+  fastify.get('/admin-properties/:key?', {  scheme: propertiesSchema }, getAdminProperties);
+  fastify.get('/user-properties/:key?', { scheme: propertiesSchema }, getUserProperties);
+  fastify.post('/admin-properties', { config: { policy: ['superadmin'] } }, postAdminProperties);
+  fastify.post('/user-properties',  postUserProperties);
+}

package/server/routes/properties/schema.js

@@ -1,11 +1,11 @@
-const propertiesSchema = {
-    params: {
-      key: { type: 'string', pattern: '^([\\d\\w._]+)$' },
-    },
-    querystring: {
-      json: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-};
-
-export default null;
+const propertiesSchema = {
+    params: {
+      key: { type: 'string', pattern: '^([\\d\\w._]+)$' },
+    },
+    querystring: {
+      json: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+};
+
+export default null;
 export { propertiesSchema }

package/server/routes/root.mjs

@@ -1,3 +1,3 @@
-export default async function (fastify, opts) {
-  fastify.get(`/test`, () => { return { test: true } });
-}
+export default async function (fastify, opts) {
+  fastify.get(`/test`, () => { return { test: true } });
+}

package/server/routes/templates/controllers/getTemplate.js

@@ -1,44 +1,44 @@
-import { config, applyHook, getTemplate, getToken, setToken } from "@opengis/fastify-table/utils.js";
-// import { getToken } from "../../../../../fastify-table/utils.js";
-
-export default async function getTemplateApi(req) {
-    const { user } = req?.session?.passport || {};
-    const { params = {}, session = {} } = req;
-    const { type, name } = params;
-
-    const tokenData = await getToken({ token: name, uid: user?.uid, json: 1 }) || {};
-
-    const hookData = await applyHook('preTemplate', { name: tokenData.name || name, type, user });
-    if (hookData?.message && hookData?.status) {
-        return hookData;
-    }
-
-    const data = await getTemplate(type, hookData?.name || tokenData.form || name);
-    if (!['interface', 'table'].includes(type)
-        && (!data?.public || !data?.ispublic)
-        && !config?.auth?.disable
-        && !session.passport?.user?.uid
-        && false
-    ) {
-        return `access restricted ${name}`;
-    }
-    if (type === 'form' && user?.uid) {
-        const schema = data.schema || data;
-        Object.keys(schema || {}).filter((key) => schema?.[key]?.add).map((key) => {
-            const { add } = schema[key];
-            Object.assign(add, { table: add.table || add.model }); // support old forms w/ model key
-            const [token] = setToken({
-                ids: [JSON.stringify(add)],
-                uid: user.uid,
-                array: 1,
-            });
-            Object.assign(schema[key].add, { token, api: `${config.prefix || '/api'}/table/${token}` });
-        });
-    }
-    await applyHook('afterTemplate', { name, type, data, user });
-    if (tokenData.obj) {
-        const obj = tokenData.obj.split('#').reduce((p, el) => ({ ...p, [el.split('=')[0]]: el.split('=')[1] }), {})
-        Object.assign(data, { obj });
-    }
-    return data?.html || data || `template not found "${name}"`;
+import { config, applyHook, getTemplate, getToken, setToken } from "@opengis/fastify-table/utils.js";
+// import { getToken } from "../../../../../fastify-table/utils.js";
+
+export default async function getTemplateApi(req) {
+    const { user } = req?.session?.passport || {};
+    const { params = {}, session = {} } = req;
+    const { type, name } = params;
+
+    const tokenData = await getToken({ token: name, uid: user?.uid, json: 1 }) || {};
+
+    const hookData = await applyHook('preTemplate', { name: tokenData.name || name, type, user });
+    if (hookData?.message && hookData?.status) {
+        return hookData;
+    }
+
+    const data = await getTemplate(type, hookData?.name || tokenData.form || name);
+    if (!['interface', 'table'].includes(type)
+        && (!data?.public || !data?.ispublic)
+        && !config?.auth?.disable
+        && !session.passport?.user?.uid
+        && false
+    ) {
+        return `access restricted ${name}`;
+    }
+    if (type === 'form' && user?.uid) {
+        const schema = data.schema || data;
+        Object.keys(schema || {}).filter((key) => schema?.[key]?.add).map((key) => {
+            const { add } = schema[key];
+            Object.assign(add, { table: add.table || add.model }); // support old forms w/ model key
+            const [token] = setToken({
+                ids: [JSON.stringify(add)],
+                uid: user.uid,
+                array: 1,
+            });
+            Object.assign(schema[key].add, { token, api: `${config.prefix || '/api'}/table/${token}` });
+        });
+    }
+    await applyHook('afterTemplate', { name, type, data, user });
+    if (tokenData.obj) {
+        const obj = tokenData.obj.split('#').reduce((p, el) => ({ ...p, [el.split('=')[0]]: el.split('=')[1] }), {})
+        Object.assign(data, { obj });
+    }
+    return data?.html || data || `template not found "${name}"`;
 }

package/server/routes/templates/index.mjs

@@ -1,16 +1,16 @@
-import getTemplateApi from './controllers/getTemplate.js';
-
-import getTemplateSchema from './schema.js'
-
-export default async function route(fastify) {
-    //fastify.decorate('addTempateFolder', addTempateFolder); // call from funcs
-    fastify.get(`/template/:type/:name`, { scheme: getTemplateSchema },  getTemplateApi);
-
-    /*fastify.addHook('onListen', async () => {
-        await addTempateFolder(path.join(process.cwd(), '/module/itree'));
-        await addTempateFolder(path.join(process.cwd(), '/module/test'));        
-      });*/
-
-
-
-}
+import getTemplateApi from './controllers/getTemplate.js';
+
+import getTemplateSchema from './schema.js'
+
+export default async function route(fastify) {
+    //fastify.decorate('addTempateFolder', addTempateFolder); // call from funcs
+    fastify.get(`/template/:type/:name`, { scheme: getTemplateSchema },  getTemplateApi);
+
+    /*fastify.addHook('onListen', async () => {
+        await addTempateFolder(path.join(process.cwd(), '/module/itree'));
+        await addTempateFolder(path.join(process.cwd(), '/module/test'));        
+      });*/
+
+
+
+}

package/server/routes/templates/schema.js

@@ -1,9 +1,9 @@
-const getTemplateSchema = {
-    params: {
-        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        // type: { type: 'string' },
-    }
-};
-
-export default null;
+const getTemplateSchema = {
+    params: {
+        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        // type: { type: 'string' },
+    }
+};
+
+export default null;
 export { getTemplateSchema }

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

@@ -1,14 +1,14 @@
-import userCls from './user.cls.js';
-
-export default async function userClsId(req) {
-  const { id } = req.params || {};
-  const res = await userCls(req);
-  if (req.query?.sql || res?.error) {
-    return res;
-  }
-  const { rows = [] } = res?.message || {};
-  if (!rows?.length) {
-    return { message: `cls not found: ${id}`, status: 404 };
-  }
-  return { message: rows?.[0], status: 200 };
-}
+import userCls from './user.cls.js';
+
+export default async function userClsId(req) {
+  const { id } = req.params || {};
+  const res = await userCls(req);
+  if (req.query?.sql || res?.error) {
+    return res;
+  }
+  const { rows = [] } = res?.message || {};
+  if (!rows?.length) {
+    return { message: `cls not found: ${id}`, status: 404 };
+  }
+  return { message: rows?.[0], status: 200 };
+}

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

@@ -1,71 +1,71 @@
-import { readFile } from 'fs/promises';
-import { getTemplatePath } from '@opengis/fastify-table/utils.js';
-
-export default async function userCls(req) {
-  const {
-    pg, params = {}, query = {}, session = {},
-  } = req;
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  if (query.type && !['json', 'sql'].includes(query.type)) {
-    return { message: 'param type is invalid', status: 400 };
-  }
-
-  const q = `select user_clsid as id, name, type, 
-  case when type='json' then (
-      ${params?.id
-    ? `(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
-        union all
-        select a.user_clsid, a.code, a.name, a.icon, a.color, a.parent
-        from admin.user_cls a
-        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, 
-      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)
-    and parent is null and ${query.type ? `type='${query.type}'` : '1=1'} and ${params?.id ? 'u.name=$2' : '1=1'}`;
-
-  if (query?.sql) return q;
-
-
-    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) }); }
-    });
-
-    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 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 };
-    }));
-
-    return { message: { rows: rows.concat(res) }, status: 200 };
-}
+import { readFile } from 'fs/promises';
+import { getTemplatePath } from '@opengis/fastify-table/utils.js';
+
+export default async function userCls(req) {
+  const {
+    pg, params = {}, query = {}, session = {},
+  } = req;
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  if (query.type && !['json', 'sql'].includes(query.type)) {
+    return { message: 'param type is invalid', status: 400 };
+  }
+
+  const q = `select user_clsid as id, name, type, 
+  case when type='json' then (
+      ${params?.id
+    ? `(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
+        union all
+        select a.user_clsid, a.code, a.name, a.icon, a.color, a.parent
+        from admin.user_cls a
+        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, 
+      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)
+    and parent is null and ${query.type ? `type='${query.type}'` : '1=1'} and ${params?.id ? 'u.name=$2' : '1=1'}`;
+
+  if (query?.sql) return q;
+
+
+    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) }); }
+    });
+
+    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 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 };
+    }));
+
+    return { message: { rows: rows.concat(res) }, status: 200 };
+}

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

@@ -1,52 +1,52 @@
-export default async function userClsPost({
-  pg, body = {}, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-  const {
-    name, type = 'json', children = [], sql,
-  } = body;
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  if (!name) {
-    return { message: 'not enough params: name', status: 400 };
-  }
-
-  if (type === 'json' && (!Array.isArray(children) || !children.length || !children?.[0]?.id)) {
-    return { message: 'invalid params: children (array of objects)', status: 400 };
-  }
-
-  if (type === 'sql' && (!sql || typeof sql !== 'string')) {
-    return { message: 'invalid params: sql (string)', status: 400 };
-  }
-
-
-    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
-      union all
-      select a.user_clsid, a.name, a.code, a.icon, a.color, a.parent
-      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);
-
-    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') {
-      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, children: rows };
-    }
-    return { id, data };
-
-}
+export default async function userClsPost({
+  pg, body = {}, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+  const {
+    name, type = 'json', children = [], sql,
+  } = body;
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  if (!name) {
+    return { message: 'not enough params: name', status: 400 };
+  }
+
+  if (type === 'json' && (!Array.isArray(children) || !children.length || !children?.[0]?.id)) {
+    return { message: 'invalid params: children (array of objects)', status: 400 };
+  }
+
+  if (type === 'sql' && (!sql || typeof sql !== 'string')) {
+    return { message: 'invalid params: sql (string)', status: 400 };
+  }
+
+
+    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
+      union all
+      select a.user_clsid, a.name, a.code, a.icon, a.color, a.parent
+      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);
+
+    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') {
+      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, children: rows };
+    }
+    return { id, data };
+
+}

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

@@ -1,17 +1,17 @@
-export default async function userInfo({
-  pg, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const data = await pg.query(`select user_name, sur_name, father_name, user_rnokpp, user_type, email, login from admin.users 
-  where uid=$1`, [uid]).then((res) => res.rows?.[0] || {});
-
-    const { notifications = 0 } = await pg.query(`select count(*)::int as notifications from crm.notifications 
-    where addressee_id=$1 and read is not true`, [uid]).then((res) => res.rows?.[0] || {});
-    return { uid, ...data, notifications };
-
-}
+export default async function userInfo({
+  pg, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const data = await pg.query(`select user_name, sur_name, father_name, user_rnokpp, user_type, email, login from admin.users 
+  where uid=$1`, [uid]).then((res) => res.rows?.[0] || {});
+
+    const { notifications = 0 } = await pg.query(`select count(*)::int as notifications from crm.notifications 
+    where addressee_id=$1 and read is not true`, [uid]).then((res) => res.rows?.[0] || {});
+    return { uid, ...data, notifications };
+
+}

package/server/routes/user/schema.js

@@ -1,14 +1,14 @@
-const userClsSchema = {
-  quertstring: {
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-};
-
-const userClsIdSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w\\.]+)$' },
-  },
-};
-
-export { userClsSchema, userClsIdSchema };
-export default null;
+const userClsSchema = {
+  quertstring: {
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+};
+
+const userClsIdSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w\\.]+)$' },
+  },
+};
+
+export { userClsSchema, userClsIdSchema };
+export default null;