@opengis/admin 0.4.23 → 0.4.25

package/server/routes/notifications/index.mjs

@@ -1,26 +1,26 @@
-import { addHook } from '@opengis/fastify-table/utils.js';
-
-// api
-import testEmail from './controllers/testEmail.js';
-import readNotifications from './controllers/readNotifications.js'; // mark as read
-import userNotifications from './controllers/userNotifications.js'; // check all, backend pagination
-
-// hook
-import onWidgetSet from './hook/onWidgetSet.js'; // send notification on comment
-
-// funcs
-// import addNotification from '../notifications/funcs/addNotification.js'; // add to db
-// import notification from '../notifications/funcs/sendNotification.js'; // send notification
-
-import { notificationSchema, emailSchema } from './schema.js';
-
-export default async function route(fastify) {
-
-  // fastify.decorate('addNotification', addNotification);
-  // fastify.decorate('notification', notification);
-
-  fastify.get('/test-email', { config: { policy: ['user'] }, schema: emailSchema }, testEmail);
-  fastify.get('/notification', { config: { policy: ['user'] }, schema: notificationSchema }, userNotifications);
-  fastify.get('/notification-read/:id?', { config: { policy: ['user'] }, schema: notificationSchema }, readNotifications);
-  addHook('onWidgetSet', onWidgetSet);
-}
+import { addHook } from '@opengis/fastify-table/utils.js';
+
+// api
+import testEmail from './controllers/testEmail.js';
+import readNotifications from './controllers/readNotifications.js'; // mark as read
+import userNotifications from './controllers/userNotifications.js'; // check all, backend pagination
+
+// hook
+import onWidgetSet from './hook/onWidgetSet.js'; // send notification on comment
+
+// funcs
+// import addNotification from '../notifications/funcs/addNotification.js'; // add to db
+// import notification from '../notifications/funcs/sendNotification.js'; // send notification
+
+import { notificationSchema, emailSchema } from './schema.js';
+
+export default async function route(fastify) {
+
+  // fastify.decorate('addNotification', addNotification);
+  // fastify.decorate('notification', notification);
+
+  fastify.get('/test-email', { config: { policy: ['user'] }, schema: emailSchema }, testEmail);
+  fastify.get('/notification', { config: { policy: ['user'] }, schema: notificationSchema }, userNotifications);
+  fastify.get('/notification-read/:id?', { config: { policy: ['user'] }, schema: notificationSchema }, readNotifications);
+  addHook('onWidgetSet', onWidgetSet);
+}

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/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,72 +1,72 @@
-import { readFile } from 'node:fs/promises';
-import { getTemplatePath, pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function userCls(req) {
-  const {
-    pg = pgClients.client, params = {}, query = {}, user = {},
-  } = req;
-  const { uid } = 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'}
-    order by cdate desc`;
-
-  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 'node:fs/promises';
+import { getTemplatePath, pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function userCls(req) {
+  const {
+    pg = pgClients.client, params = {}, query = {}, user = {},
+  } = req;
+  const { uid } = 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'}
+    order by cdate desc`;
+
+  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.edit.js

@@ -0,0 +1,19 @@
+import { pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function userEdit(req, reply) {
+    const {
+        pg = pgClients.client, body = {}, user = {}, params = {}
+    } = req
+    if (!params?.id) return reply.code(400).send({ status: 400, message: 'User id is empty' });
+    const { id } = params;
+
+    if (user?.uid !== id) return reply.code(403).send({ status: 403, message: 'Invalid user id' });
+
+    if (!body) return reply.code(400).send({ status: 400, message: 'body id is empty' });
+    const { sur_name, user_name, father_name, email, phone, avatar } = body
+
+    const updateSql = 'update admin.users set sur_name=$2,user_name=$3,father_name=$4,email=$5,phone=$6,avatar=$7 where uid =$1';
+
+    await pg.query(updateSql, [id, sur_name, user_name, father_name, email, phone, avatar]);
+    return reply.code(200).send({ status: 200, message: 'Updated successfully!' })
+}

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

@@ -1,17 +1,17 @@
-export default async function userInfo({
-  pg, user = {},
-}) {
-  const { uid } = 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, user = {},
+}) {
+  const { uid } = 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/index.mjs

@@ -2,6 +2,7 @@ import userCls from './controllers/user.cls.js';
 import userClsId from './controllers/user.cls.id.js';
 import userInfo from './controllers/user.info.js';
 import userClsPost from './controllers/user.cls.post.js';
+import userEdit from './controllers/user.edit.js';
 
 import { userClsSchema, userClsIdSchema } from './schema.js';
 
@@ -10,6 +11,11 @@ async function plugin(fastify, opts) {
   fastify.get('/user-cls/:id', { config: { policy: ['user'] }, schema: userClsIdSchema }, userClsId);
   fastify.get('/user-info', { config: { policy: ['user'] } }, userInfo);
   fastify.post('/user-cls', { config: { policy: ['user'] }, schema: userClsIdSchema }, userClsPost);
+
+  fastify.put('/user/:id', { config: { policy: ['user'] } }, userEdit);
+
+
+
 }
 
 export default plugin;

package/server/templates/cls/itree.recrzone_category.json

@@ -1,74 +1,74 @@
-[
-    {
-        "id": "12",
-        "text": "Розділювальна смуга",
-        "color": "#85754e",
-        "en": "Dividing line"
-    },
-    {
-        "id": "6",
-        "text": "Бульвар",
-        "color": "#00703c",
-        "en": "Boulevard"
-    },
-    {
-        "id": "1",
-        "text": "Вуличні насадження",
-        "color": "#8fbc8f",
-        "en": "Street plantings"
-    },
-    {
-        "id": "2",
-        "text": "Парк",
-        "color": "#a2cd5a",
-        "en": "Park"
-    },
-    {
-        "id": "3",
-        "text": "Сад",
-        "color": "#5e8c31",
-        "en": "Garden"
-    },
-    {
-        "id": "4",
-        "text": "Сквер",
-        "color": "#00ced1",
-        "en": "Square"
-    },
-    {
-        "id": "9",
-        "text": "Рекреаційна зона",
-        "color": "#e1a95f",
-        "en": "Recreational zone"
-    },
-    {
-        "id": "10",
-        "text": "Санітарно-захисна зона",
-        "color": "#6e7b8b",
-        "en": "Sanitary protection zone"
-    },
-    {
-        "id": "11",
-        "text": "Зелені насадження прибудинкової території",
-        "color": "#ace1af",
-        "en": "Green plantations in local areas"
-    },
-    {
-        "id": "5",
-        "text": "Прибережні зелені насадження",
-        "color": "#698b69",
-        "en": "Coastal green plantations"
-    },
-    {
-        "id": "7",
-        "text": "Лісопарк",
-        "color": "#6e8b3d",
-        "en": "Forest park"
-    },
-    {
-        "id": "8",
-        "text": "Міський ліс",
-        "color": "#4a5d23",
-        "en": "Urban forest"
-    }
+[
+    {
+        "id": "12",
+        "text": "Розділювальна смуга",
+        "color": "#85754e",
+        "en": "Dividing line"
+    },
+    {
+        "id": "6",
+        "text": "Бульвар",
+        "color": "#00703c",
+        "en": "Boulevard"
+    },
+    {
+        "id": "1",
+        "text": "Вуличні насадження",
+        "color": "#8fbc8f",
+        "en": "Street plantings"
+    },
+    {
+        "id": "2",
+        "text": "Парк",
+        "color": "#a2cd5a",
+        "en": "Park"
+    },
+    {
+        "id": "3",
+        "text": "Сад",
+        "color": "#5e8c31",
+        "en": "Garden"
+    },
+    {
+        "id": "4",
+        "text": "Сквер",
+        "color": "#00ced1",
+        "en": "Square"
+    },
+    {
+        "id": "9",
+        "text": "Рекреаційна зона",
+        "color": "#e1a95f",
+        "en": "Recreational zone"
+    },
+    {
+        "id": "10",
+        "text": "Санітарно-захисна зона",
+        "color": "#6e7b8b",
+        "en": "Sanitary protection zone"
+    },
+    {
+        "id": "11",
+        "text": "Зелені насадження прибудинкової території",
+        "color": "#ace1af",
+        "en": "Green plantations in local areas"
+    },
+    {
+        "id": "5",
+        "text": "Прибережні зелені насадження",
+        "color": "#698b69",
+        "en": "Coastal green plantations"
+    },
+    {
+        "id": "7",
+        "text": "Лісопарк",
+        "color": "#6e8b3d",
+        "en": "Forest park"
+    },
+    {
+        "id": "8",
+        "text": "Міський ліс",
+        "color": "#4a5d23",
+        "en": "Urban forest"
+    }
 ]

package/server/templates/cls/test.json

@@ -1,10 +1,10 @@
-[
-    {
-        "id": 1,
-        "text": "test"
-    },
-    {
-        "id": 2,
-        "text": "test2"
-    }
+[
+    {
+        "id": 1,
+        "text": "test"
+    },
+    {
+        "id": 2,
+        "text": "test2"
+    }
 ]

package/server/templates/form/admin.user_cls.data.form.json

@@ -1,50 +1,50 @@
-{
-    "label_style": "vertical",
-    "schema": {
-        "code": {
-            "type": "Text",
-            "ua": "Код",
-            "ru": "Код",
-            "en": "Code",
-            "placeholder": {
-                "ua": "Код",
-                "ru": "Код",
-                "en": "Code"
-            },
-            "validators": [
-                "required"
-            ],
-            "col": 6
-        },        
-        "name": {
-            "type": "Text",
-            "ua": "Назва",
-            "ru": "Название",
-            "en": "Name",
-            "placeholder": {
-                "ua": "Назва",
-                "ru": "Название",
-                "en": "Name"
-            },
-            "validators": [
-                "required"
-            ],
-            "col": 6
-        },
-        "icon": {
-            "type": "File",
-            "multi": false,
-            "ua": "Іконка",
-            "ru": "Иконка",
-            "en": "Icon",
-            "col": 6
-        },
-        "color": {
-            "type": "ColorPicker",
-            "ua": "Колір",
-            "ru": "Цвет",
-            "en": "Color",
-            "col": 6
-        }        
-    }
+{
+    "label_style": "vertical",
+    "schema": {
+        "code": {
+            "type": "Text",
+            "ua": "Код",
+            "ru": "Код",
+            "en": "Code",
+            "placeholder": {
+                "ua": "Код",
+                "ru": "Код",
+                "en": "Code"
+            },
+            "validators": [
+                "required"
+            ],
+            "col": 6
+        },        
+        "name": {
+            "type": "Text",
+            "ua": "Назва",
+            "ru": "Название",
+            "en": "Name",
+            "placeholder": {
+                "ua": "Назва",
+                "ru": "Название",
+                "en": "Name"
+            },
+            "validators": [
+                "required"
+            ],
+            "col": 6
+        },
+        "icon": {
+            "type": "File",
+            "multi": false,
+            "ua": "Іконка",
+            "ru": "Иконка",
+            "en": "Icon",
+            "col": 6
+        },
+        "color": {
+            "type": "ColorPicker",
+            "ua": "Колір",
+            "ru": "Цвет",
+            "en": "Color",
+            "col": 6
+        }        
+    }
 }

package/server/templates/form/admin.user_group_rel.form.json

@@ -1,22 +1,22 @@
-{
-    "schema": {
-        "user_uid": {
-            "type": "Autocomplete",
-            "data": "user_id",
-            "ua": "Користувач",
-            "validators": [
-                "required"
-            ]
-        },
-        "user_access": {
-            "type": "Select2",
-            "data": "user_access",
-            "placeholder": "Згідно налаштувань інтерфейсів",
-            "ua": "Доступ"
-        },
-        "expiration": {
-            "type": "DatePicker",
-            "ua": "Закінчення терміну дії доступу до групи"
-        }
-    }
+{
+    "schema": {
+        "user_uid": {
+            "type": "Autocomplete",
+            "data": "user_id",
+            "ua": "Користувач",
+            "validators": [
+                "required"
+            ]
+        },
+        "user_access": {
+            "type": "Select2",
+            "data": "user_access",
+            "placeholder": "Згідно налаштувань інтерфейсів",
+            "ua": "Доступ"
+        },
+        "expiration": {
+            "type": "DatePicker",
+            "ua": "Закінчення терміну дії доступу до групи"
+        }
+    }
 }

package/server/templates/form/form-user-pass.json

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