@opengis/admin 0.4.15 → 0.4.17

package/dist/{card-view-Cj5WEg5z.js → card-view-B6lmjnUp.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as e, createBlock as r, openBlock as t } from "vue";
-import { _ as c } from "./import-file-q1gVGP28.js";
+import { _ as c } from "./import-file-DanTkH8S.js";
 const n = {};
 function s(_, p, a, i, f, m) {
   const o = e("router-view");

package/dist/{edit-page-r6I6Vi6E.js → edit-page-BRMI75iP.js}

@@ -1,4 +1,4 @@
-import { _ as $, f as d, u as k, s as V } from "./import-file-q1gVGP28.js";
+import { _ as $, f as d, u as k, s as V } from "./import-file-DanTkH8S.js";
 import { resolveComponent as j, createElementBlock as g, openBlock as p, createElementVNode as m, createCommentVNode as b, normalizeClass as x, normalizeStyle as y, createBlock as E } from "vue";
 const O = {
   data() {

package/dist/{import-file-q1gVGP28.js → import-file-DanTkH8S.js}

@@ -3725,27 +3725,27 @@ const rM = [
   {
     name: "edit",
     path: "/edit",
-    component: () => import("./edit-page-r6I6Vi6E.js")
+    component: () => import("./edit-page-BRMI75iP.js")
   },
   {
     name: "add",
     path: "/add",
-    component: () => import("./add-page-CLQKORAq.js")
+    component: () => import("./add-page-D3JHk421.js")
   },
   {
     path: "/profile",
     name: "profile",
-    component: () => import("./profile-page-DRdrE5zR.js")
+    component: () => import("./profile-page-Cvt3Wmr6.js")
   },
   {
     name: "card-view",
     path: "/card",
-    component: () => import("./card-view-Cj5WEg5z.js"),
+    component: () => import("./card-view-B6lmjnUp.js"),
     children: [
       {
         name: "table",
         path: ":table",
-        component: () => import("./card-view-Cj5WEg5z.js"),
+        component: () => import("./card-view-B6lmjnUp.js"),
         children: [
           {
             name: "card",
@@ -3806,14 +3806,14 @@ const cM = /* @__PURE__ */ gt(sM, [["render", lM]]), uM = (t) => {
         {
           path: "/",
           name: "home",
-          component: () => import("./admin-view-B2qQ1IHJ.js"),
+          component: () => import("./admin-view-BaFEZfOb.js"),
           children: [
             ...t,
             ...e,
             // { path: '/', redirect: '/home' },
             {
               path: "/:catchAll(.*)",
-              component: () => import("./admin-interface-CpLDRPag.js")
+              component: () => import("./admin-interface-Bh0X1WRG.js")
             }
           ]
         }

package/dist/{profile-page-DRdrE5zR.js → profile-page-Cvt3Wmr6.js}

@@ -1,4 +1,4 @@
-import { _ as n, f as m } from "./import-file-q1gVGP28.js";
+import { _ as n, f as m } from "./import-file-DanTkH8S.js";
 import { u as p } from "./user-B_2kh6ic.js";
 import { resolveComponent as f, createElementBlock as d, openBlock as u, createElementVNode as o, createBlock as h, createCommentVNode as b } from "vue";
 const x = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.4.15",
+  "version": "0.4.17",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -25,6 +25,7 @@
     "prod": "cross-env NODE_ENV=production npm run start",
     "debug": "node --watch-path=server server",
     "start": "node server",
+    "start-env": "node --env-file=.env server",
     "docs:i": "npm install --prefix ./docs",
     "docs:dev": "npm run --prefix ./docs docs:dev",
     "docs:build": "npm run --prefix ./docs docs:build",
@@ -51,7 +52,7 @@
     "@opengis/fastify-auth": "1.1.x",
     "@opengis/fastify-table": "1.4.x",
     "@opengis/v3-core": "^0.3.213",
-    "@opengis/v3-filter": "^0.1.3",
+    "@opengis/v3-filter": "0.1.30",
     "@turf/turf": "^7.1.0",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vueuse/core": "^13.0.0",

package/server/routes/widget/controllers/file.edit.js

@@ -1,51 +0,0 @@
-import path from 'node:path';
-
-import { dataUpdate, pgClients, uploadMultiPart } from '@opengis/fastify-table/utils.js';
-
-export default async function widgetSet(req, reply) {
-    const { pg = pgClients.client, headers = {}, user = {}, params = {} } = req;
-
-    if (!params?.id) {
-        return reply.status(400).send('not enough params: id');
-    }
-
-    if (!pg.pk?.['crm.files']) {
-        return reply.status(404).send('table not found');
-    }
-
-    if (headers['content-type']?.split?.(';')?.shift?.() !== 'multipart/form-data') {
-        return reply.status(400).send('invalid payload content type');
-    }
-
-    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,
-    };
-
-    const result = await dataUpdate({
-        pg,
-        table: 'crm.files',
-        id: params.id,
-        data,
-        uid: user?.uid,
-    });
-
-    if (!result?.file_id) {
-        return reply.status(404).send('file not found');
-    }
-
-    return reply.status(200).send({
-        rowCount: 1,
-        data: result,
-        command: 'UPLOAD',
-        id: result?.file_id,
-        entity_id: result?.entity_id,
-    });
-}

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

@@ -1,79 +0,0 @@
-import { pgClients, logChanges, isFileExists } from "@opengis/fastify-table/utils.js";
-
-import { isAdmin } from "../../../../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 Повідомлення про успішне виконання або об'єкт з параметрами
- */
-
-export default async function widgetDel(req, reply) {
-  const {
-    pg = pgClients.client, params = {}, user = {},
-  } = req;
-
-  if (!user?.uid) {
-    return reply.status(401).send('access restricted: user not authorized');
-  }
-
-  const { type, objectid, id } = params;
-
-  if (!objectid) {
-    return reply.status(400).send('not enough params: id');
-  }
-
-  // force delete db entry if file not exists
-  const { exists, uid } = ['file', 'gallery'].includes(type) ? await checkAccess(pg, objectid, id) : {};
-
-  if (exists && !isAdmin(req) && 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 ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and communication_id=$3`,
-    checklist: `delete from crm.checklists where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and checklist_id=$3`,
-    file: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || isAdmin(req) ? '$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 || isAdmin(req) ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
-  };
-
-  const sql = sqls[type];
-  const table = {
-    comment: 'crm.communications',
-    checklist: 'crm.checklists',
-    file: 'crm.files',
-    gallery: 'crm.files',
-  }[type];
-
-  if (!sql) {
-    return reply.status(400).send('invalid widget type');
-  }
-
-  const { rows = [] } = await pg.query(sql, [objectid, user.uid, id]);
-
-  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.get.js

@@ -1,136 +0,0 @@
-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,'')`;
-
-/**
- * Дістає CRM для widget
- *
- */
-
-export default async function widgetGet({
-  pg = pgClients.client, user = {}, params = {}, query = {}, unittest,
-}, reply) {
-  const param = user?.uid ? await getToken({
-    token: params.objectid, mode: 'w', uid: user.uid,
-  }) : null;
-
-  const objectid = param ? JSON.parse(param)?.id : params.objectid;
-
-  if (!objectid) {
-    return reply.status(400).send('not enough params: id');
-  }
-
-  const sqls = {
-    comment: pg.pk['admin.users']
-      ? `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
-    ${username} as username, u.login, u.avatar
-    from crm.communications c
-    left join admin.users u on u.uid=c.uid 
-    where entity_id=$1 order by cdate desc`
-      : 'select communication_id, entity_id, body, subject, cdate, uid from crm.communications where entity_id=$1 order by cdate desc',
-
-    history: `select * from (
-      SELECT change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
-      ${username} as username, u.login, u.avatar
-      FROM log.table_changes a
-      left join admin.users u on a.change_user_id = u.uid
-      left join lateral(
-        select json_agg(row_to_json(q)) from (
-          select change_data_id, entity_key, value_new, value_old from log.table_changes_data
-          where change_id=a.change_id
-        )q
-      )b on 1=1
-      where b.json_agg is not null and (entity_id=$1 or entity_id in (
-        select communication_id as comments from crm.communications where entity_id=$1
-        union all select checklist_id from crm.checklists where entity_id=$1)
-      )
-
-    union all
-    select change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
-        ${username} as username, u.login, u.avatar
-        FROM log.table_changes a
-        left join admin.users u on a.change_user_id = u.uid
-            left join lateral(
-          select json_agg(o) from (
-            select json_object_agg(entity_key, coalesce(value_new, value_old)) as o from log.table_changes_data
-            where change_id=a.change_id and entity_key not in ('uid', 'file_status', 'editor_id', 'cdate', 'editor_date', 'entity_id')
-          )q 
-        )b on 1=1
-        where a.change_type in ('INSERT', 'DELETE') and a.entity_id in (select file_id from crm.files where entity_id=$1)
-        limit 100
-
-    )q order by cdate desc limit 100`,
-
-    checklist: pg.pk['admin.users']
-      ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, ${username} as username, u.login, u.avatar
-      FROM crm.checklists c
-      left join admin.users u on u.uid=c.uid
-      where entity_id=$1 order by cdate desc`
-      : 'SELECT checklist_id, entity_id, subject, is_done, done_date, uid, cdate FROM crm.checklists where entity_id=$1 order by cdate desc',
-
-    file: pg.pk['admin.users']
-      ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain, 
-    ${username} as username, u.login, isverified, u.avatar, u.uid as author, file_status 
-    FROM crm.files c 
-    left join admin.users u on u.uid=c.uid
-    where entity_id=$1 and file_status<>3 order by cdate desc`
-      : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, uid, cdate, file_type, ismain,
-      isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 order by cdate desc`,
-    gallery: pg.pk['admin.users']
-      ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
-    ${username} as username, u.login, u.avatar, isverified, u.avatar, c.uid as author, file_status 
-    FROM crm.files c 
-    left join admin.users u on u.uid=c.uid
-    where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`
-      : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, ismain,
-      isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`,
-
-  };
-
-  const q = sqls[params.type];
-
-  if (!q) {
-    return reply.status(400).send('invalid widget type');
-  }
-
-
-  /* data */
-  const time = [Date.now()];
-  const { rows = [] } = await pg.query(q, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el));
-  rows.forEach(row => Object.assign(row, { username: row.username?.trim?.() || row.login }));
-  time.push(Date.now());
-
-  /* Object info  */
-  const { tableName } = pg.pk['log.table_changes'] ? await pg.query(
-    'select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1',
-    [objectid]
-  ).then(el => el.rows?.[0] || {}) : {};
-
-  const { pk, columns = [] } = await getMeta({ pg, table: tableName });
-
-  const authorIdColumn = columns.find(col => ['uid', 'created_by'].includes(col.name))?.name;
-
-  if (!pk && params.type === 'history' && !unittest) {
-    return reply.status(404).send('log table not found');
-  }
-
-  const q1 = `select ${username} as author, u.login, a.cdate, a.editor_date from ${tableName} a 
-  left join admin.users u on a.${authorIdColumn}=u.uid where a.${pk}=$1 limit 1`;
-
-  const data = pg.pk['admin.users'] && pk && tableName ? await pg.query(q, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el)).then(el => el.rows?.[0] || {}) : {};
-
-  if (query.debug && user?.user_type === 'admin') {
-    return {
-      q, type: params.type, q1, id: objectid, data,
-    };
-  }
-
-  return {
-    time: { data: time[1] - time[0] },
-    rows,
-    user: { uid: user?.uid, name: user?.user_name },
-    data: { author: data?.author, cdate: data?.cdate, edate: data?.editor_date },
-    objectid: params.objectid,
-  };
-}

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

@@ -1,99 +0,0 @@
-import path from 'path';
-
-import {
-  getMeta, dataInsert, dataUpdate, applyHook, uploadMultiPart,
-} from '@opengis/fastify-table/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, reply) {
-  const {
-    pg, params = {}, session = {}, headers = {}, body = {}, user = {}, unittest,
-  } = req;
-  const { type, id, objectid } = params;
-
-  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) {
-    return reply.status(400).send('param type not valid');
-  }
-
-  if (!objectid) {
-    return reply.status(400).send('not enough params: id');
-  }
-
-  const table = tableList[type];
-
-  // dsadasdad
-  if (['gallery', 'file'].includes(type) && 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 reply.status(400).send('invalid file extension');
-    }
-
-    const { rows = [] } = await dataInsert({
-      pg, table: 'crm.files', data, uid: user?.uid,
-    });
-
-    if (type === 'gallery') {
-      await pg.query(`update crm.files set ismain=true 
-      where entity_id=$1 
-      and file_id=$2 
-      and (select count(*) = 0 from crm.files where entity_id=$1 and ismain)`, [objectid, rows[0]?.file_id]);
-    }
-
-    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 reply.status(404).send('table not found');
-  }
-
-  const data = { ...body, uid: user?.uid, entity_id: objectid };
-
-  await applyHook('onWidgetSet', {
-    pg,
-    link: req.path,
-    id,
-    objectid,
-    session,
-    type,
-    payload: data,
-  });
-
-  const result = id
-    ? await dataUpdate({
-      pg, table, data, id, uid: user?.uid,
-    })
-    : await dataInsert({
-      pg, 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 +0,0 @@
-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,20 +0,0 @@
-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 fileEdit from './controllers/file.edit.js';
-
-import onWidgetSet from './hook/onWidgetSet.js';
-
-import { tableSchema } from './schema.js';
-
-const policy = ['site'];
-
-export default async function route(fastify) {
-  fastify.delete(`/widget/:type/:objectid/:id`, { config: { policy }, scheme: tableSchema }, widgetDel);
-  fastify.post(`/widget/:type/:objectid/:id?`, { config: { policy }, scheme: tableSchema }, widgetSet);
-  fastify.put(`/file-edit/:id`, { config: { policy }, scheme: tableSchema }, fileEdit);
-  fastify.get(`/widget/:type/:objectid`, { config: { policy: ['public'] }, scheme: tableSchema }, widgetGet);
-  addHook('onWidgetSet', onWidgetSet);
-}

package/server/routes/widget/schema.js

@@ -1,13 +0,0 @@
-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 }