@opengis/admin 0.3.32 → 0.3.34

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

@@ -1,63 +1,63 @@
-import { isFileExists } from "@opengis/fastify-file/utils.js";
-
-async function checkAccess(pg, objectid, id) {
-  const { uid, filepath } = await pg.query(`select uid, file_path as filepath from crm.files where entity_id=$1 and file_id=$2`, [objectid, id])
-    .then(el => el.rows?.[0] || {});
-  return { uid, exists: filepath ? await isFileExists(filepath) : null };
-}
-
-/**
- * Дістає CRM дані для vue хешує ідентифікатори, підтягує селекти
- *
- * @method DELETE
- * @summary CRM дані для обраного віджета.
- * @priority 2
- * @tag table
- * @type api
- * @requires setTokenById
- * @requires getSelect
- * @param {String} id Ідентифікатор для хешування
- * @param {Any} sql Використовується для повернення sql запиту
- * @param {String} type Тип для хешування даних
- * @errors 400, 500
- * @returns {Number} status Номер помилки
- * @returns {String|Object} error Опис помилки
- * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
- */
-
-import { pgClients, logChanges } from "@opengis/fastify-table/utils.js";
-
-export default async function widgetDel({
-  pg = pgClients.client, params = {}, session = {},
-}, reply) {
-  const { user = {} } = session.passport || {};
-  if (!user.uid) return { error: 'access restricted', status: 403 };
-  const { type, objectid, id } = params;
-
-  if (!objectid) return { error: 'id required', status: 400 };
-
-  // force delete db entry if file not exists
-  const { exists, uid } = ['file', 'gallery'].includes(type) ? await checkAccess(pg, objectid, id) : {};
-
-  if (exists && !user?.user_type?.includes?.('admin') && uid && user?.uid !== uid) {
-    return reply.status(403).send('access restricted: file exists, not an author');
-  }
-
-  const sqls = {
-    comment: 'delete from crm.communications where entity_id=$1 and uid=$2 and communication_id=$3',
-    checklist: 'delete from crm.checklists where entity_id=$1 and uid=$2 and checklist_id=$3',
-    file: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || user?.user_type?.includes?.('admin') ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
-    gallery: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || user?.user_type?.includes?.('admin') ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
-  };
-  const sql = sqls[type];
-  // console.log(sql);
-  if (!sql) return reply.status(400).send('type not valid');
-
-  const { rows = [] } = await pg.query(sql, [objectid, user.uid, id]);
-  const table = { comment: 'crm.communications', checklist: 'crm.checklists', file: 'crm.files', gallery: 'crm.files' }[type];
-  await logChanges({
-    pg, table, id, data: rows[0], uid: user?.uid, type: 'DELETE',
-  });
-  return { data: { id }, user: { uid: user.uid, name: user.user_name } };
-
-}
+import { isFileExists } from "@opengis/fastify-file/utils.js";
+
+async function checkAccess(pg, objectid, id) {
+  const { uid, filepath } = await pg.query(`select uid, file_path as filepath from crm.files where entity_id=$1 and file_id=$2`, [objectid, id])
+    .then(el => el.rows?.[0] || {});
+  return { uid, exists: filepath ? await isFileExists(filepath) : null };
+}
+
+/**
+ * Дістає CRM дані для vue хешує ідентифікатори, підтягує селекти
+ *
+ * @method DELETE
+ * @summary CRM дані для обраного віджета.
+ * @priority 2
+ * @tag table
+ * @type api
+ * @requires setTokenById
+ * @requires getSelect
+ * @param {String} id Ідентифікатор для хешування
+ * @param {Any} sql Використовується для повернення sql запиту
+ * @param {String} type Тип для хешування даних
+ * @errors 400, 500
+ * @returns {Number} status Номер помилки
+ * @returns {String|Object} error Опис помилки
+ * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
+ */
+
+import { pgClients, logChanges } from "@opengis/fastify-table/utils.js";
+
+export default async function widgetDel({
+  pg = pgClients.client, params = {}, session = {},
+}, reply) {
+  const { user = {} } = session.passport || {};
+  if (!user.uid) return { error: 'access restricted', status: 403 };
+  const { type, objectid, id } = params;
+
+  if (!objectid) return { error: 'id required', status: 400 };
+
+  // force delete db entry if file not exists
+  const { exists, uid } = ['file', 'gallery'].includes(type) ? await checkAccess(pg, objectid, id) : {};
+
+  if (exists && !user?.user_type?.includes?.('admin') && uid && user?.uid !== uid) {
+    return reply.status(403).send('access restricted: file exists, not an author');
+  }
+
+  const sqls = {
+    comment: 'delete from crm.communications where entity_id=$1 and uid=$2 and communication_id=$3',
+    checklist: 'delete from crm.checklists where entity_id=$1 and uid=$2 and checklist_id=$3',
+    file: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || user?.user_type?.includes?.('admin') ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
+    gallery: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || user?.user_type?.includes?.('admin') ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
+  };
+  const sql = sqls[type];
+  // console.log(sql);
+  if (!sql) return reply.status(400).send('type not valid');
+
+  const { rows = [] } = await pg.query(sql, [objectid, user.uid, id]);
+  const table = { comment: 'crm.communications', checklist: 'crm.checklists', file: 'crm.files', gallery: 'crm.files' }[type];
+  await logChanges({
+    pg, table, id, data: rows[0], uid: user?.uid, type: 'DELETE',
+  });
+  return { data: { id }, user: { uid: user.uid, name: user.user_name } };
+
+}

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

@@ -1,84 +1,84 @@
-import path from 'path';
-
-import {
-  getMeta, dataInsert, dataUpdate, applyHook,
-} from '@opengis/fastify-table/utils.js';
-
-import { uploadMultiPart } from '@opengis/fastify-file/utils.js';
-
-const tableList = {
-  comment: 'crm.communications',
-  gallery: 'crm.files',
-  checklist: 'crm.checklists',
-};
-const pkList = {
-  comment: 'communication_id',
-  checklist: 'checklist_id',
-  gallery: 'file_id',
-};
-
-const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
-
-export default async function widgetSet(req) {
-  const {
-    pg, params = {}, session = {}, body = {},
-  } = req;
-  const { user = {} } = session.passport || {};
-  const { type, id, objectid } = params;
-  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) return { message: 'param type not valid', status: 400 };
-  if (!objectid) return { message: 'id required', status: 400 };
-
-  const table = tableList[type];
-
-  // dsadasdad
-  if (['gallery', 'file'].includes(type) && req.headers['content-type'].split(';').shift() === "multipart/form-data") {
-    const file = await uploadMultiPart(req);
-    const extName = path.extname(file.filepath).slice(1).toLowerCase();
-
-    const data = {
-      uploaded_name: file?.originalFilename?.toLocaleLowerCase()?.replace(/'/g, '\'\''),
-      file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
-      ext: extName,
-      size: file?.size,
-      file_status: 1,
-      uid: user?.uid || 1,
-      entity_id: objectid,
-    };
-
-    if (type === 'gallery' && !galleryExtList.includes(extName.toLowerCase())) {
-      return { message: 'invalid file extension', status: 400 };
-    }
-
-    const { rows = [] } = await dataInsert({
-      table: 'crm.files', data, uid: user?.uid,
-    });
-    return {
-      rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
-    };
-  }
-  const { pk } = await getMeta({ pg, table });
-  if (!pk) return { message: 'table not found', status: 404 };
-
-  const data = { ...body, uid: user?.uid, entity_id: objectid };
-
-  await applyHook('onWidgetSet', {
-    link: req.path,
-    id,
-    objectid,
-    session,
-    type,
-    payload: data,
-  });
-
-  const result = id
-    ? await dataUpdate({
-      table, data, id, uid: user?.uid,
-    })
-    : await dataInsert({
-      table, data, uid: user?.uid,
-    });
-
-  return {
-    rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
-  };
-}
+import path from 'path';
+
+import {
+  getMeta, dataInsert, dataUpdate, applyHook,
+} from '@opengis/fastify-table/utils.js';
+
+import { uploadMultiPart } from '@opengis/fastify-file/utils.js';
+
+const tableList = {
+  comment: 'crm.communications',
+  gallery: 'crm.files',
+  checklist: 'crm.checklists',
+};
+const pkList = {
+  comment: 'communication_id',
+  checklist: 'checklist_id',
+  gallery: 'file_id',
+};
+
+const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
+
+export default async function widgetSet(req) {
+  const {
+    pg, params = {}, session = {}, body = {},
+  } = req;
+  const { user = {} } = session.passport || {};
+  const { type, id, objectid } = params;
+  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) return { message: 'param type not valid', status: 400 };
+  if (!objectid) return { message: 'id required', status: 400 };
+
+  const table = tableList[type];
+
+  // dsadasdad
+  if (['gallery', 'file'].includes(type) && req.headers['content-type'].split(';').shift() === "multipart/form-data") {
+    const file = await uploadMultiPart(req);
+    const extName = path.extname(file.filepath).slice(1).toLowerCase();
+
+    const data = {
+      uploaded_name: file?.originalFilename?.toLocaleLowerCase()?.replace(/'/g, '\'\''),
+      file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
+      ext: extName,
+      size: file?.size,
+      file_status: 1,
+      uid: user?.uid || 1,
+      entity_id: objectid,
+    };
+
+    if (type === 'gallery' && !galleryExtList.includes(extName.toLowerCase())) {
+      return { message: 'invalid file extension', status: 400 };
+    }
+
+    const { rows = [] } = await dataInsert({
+      table: 'crm.files', data, uid: user?.uid,
+    });
+    return {
+      rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
+    };
+  }
+  const { pk } = await getMeta({ pg, table });
+  if (!pk) return { message: 'table not found', status: 404 };
+
+  const data = { ...body, uid: user?.uid, entity_id: objectid };
+
+  await applyHook('onWidgetSet', {
+    link: req.path,
+    id,
+    objectid,
+    session,
+    type,
+    payload: data,
+  });
+
+  const result = id
+    ? await dataUpdate({
+      table, data, id, uid: user?.uid,
+    })
+    : await dataInsert({
+      table, data, uid: user?.uid,
+    });
+
+  return {
+    rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
+  };
+}

package/server/routes/widget/hook/onWidgetSet.js

@@ -1,12 +1,12 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function onWidgetSet({
-  pg = pgClients.client, id, objectid, type, payload = {},
-}) {
-  if (!id || !objectid || type !== 'gallery') {
-    return null;
-  }
-  if (payload?.ismain) {
-    await pg.query('update crm.files set ismain=false where entity_id=$1 and file_id<>$2', [objectid, id]);
-  }
-}
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function onWidgetSet({
+  pg = pgClients.client, id, objectid, type, payload = {},
+}) {
+  if (!id || !objectid || type !== 'gallery') {
+    return null;
+  }
+  if (payload?.ismain) {
+    await pg.query('update crm.files set ismain=false where entity_id=$1 and file_id<>$2', [objectid, id]);
+  }
+}

package/server/routes/widget/index.mjs

@@ -1,16 +1,16 @@
-import { addHook } from '@opengis/fastify-table/utils.js';
-
-import widgetDel from './controllers/widget.del.js';
-import widgetSet from './controllers/widget.set.js';
-import widgetGet from './controllers/widget.get.js';
-
-import onWidgetSet from './hook/onWidgetSet.js';
-
-import { tableSchema } from './schema.js';
-
-export default async function route(fastify) {
-  fastify.delete(`/widget/:type/:objectid/:id`, { scheme: tableSchema }, widgetDel);
-  fastify.post(`/widget/:type/:objectid/:id?`, { scheme: tableSchema }, widgetSet);
-  fastify.get(`/widget/:type/:objectid`, { config: { policy: ['public'] }, scheme: tableSchema }, widgetGet);
-  addHook('onWidgetSet', onWidgetSet);
-}
+import { addHook } from '@opengis/fastify-table/utils.js';
+
+import widgetDel from './controllers/widget.del.js';
+import widgetSet from './controllers/widget.set.js';
+import widgetGet from './controllers/widget.get.js';
+
+import onWidgetSet from './hook/onWidgetSet.js';
+
+import { tableSchema } from './schema.js';
+
+export default async function route(fastify) {
+  fastify.delete(`/widget/:type/:objectid/:id`, { scheme: tableSchema }, widgetDel);
+  fastify.post(`/widget/:type/:objectid/:id?`, { scheme: tableSchema }, widgetSet);
+  fastify.get(`/widget/:type/:objectid`, { config: { policy: ['public'] }, scheme: tableSchema }, widgetGet);
+  addHook('onWidgetSet', onWidgetSet);
+}

package/server/routes/widget/schema.js

@@ -1,13 +1,13 @@
-const tableSchema = {
-    params: {
-      // type: { type: 'string', pattern: '^([\\d\\w]+)$' },
-      objectid: { type: 'string', pattern: '^([\\d\\w]+)$' },
-      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-    querystring: {
-      debug: { type: 'string', pattern: '^(\\d+)$' },
-    },
-  };
-
-export default null;
+const tableSchema = {
+    params: {
+      // type: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      objectid: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+    querystring: {
+      debug: { type: 'string', pattern: '^(\\d+)$' },
+    },
+  };
+
+export default null;
 export { tableSchema }

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
+        }        
+    }
 }