@opengis/admin 0.3.34 → 0.3.36

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (118) hide show
  1. package/README.md +97 -97
  2. package/config.js +4 -4
  3. package/dist/{add-page-BLI6eYKZ.js → add-page-DmhwcAMY.js} +1 -1
  4. package/dist/{admin-interface-C-9ck5bh.js → admin-interface-5dHYgR-t.js} +2 -2
  5. package/dist/{admin-view-BXufT2M6.js → admin-view-C7JteOit.js} +1 -1
  6. package/dist/admin.js +1 -1
  7. package/dist/admin.umd.cjs +74 -74
  8. package/dist/assets/logo.svg +41 -41
  9. package/dist/{card-view-CLN2Mb-l.js → card-view-Cey1LE5b.js} +1 -1
  10. package/dist/{edit-page-Dyz5EGP8.js → edit-page-C-cpKJC2.js} +1 -1
  11. package/dist/{import-file-CPjCLF7q.js → import-file-B53vJ2ve.js} +10530 -10530
  12. package/dist/{profile-page-DMOywdik.js → profile-page-BqYeCCjU.js} +1 -1
  13. package/dist/style.css +1 -1
  14. package/module/settings/card/admin.accounts.table/index.yml +7 -7
  15. package/module/settings/card/admin.accounts.table/rules.hbs +18 -18
  16. package/module/settings/card/admin.accounts.table/users.hbs +13 -13
  17. package/module/settings/card/admin.routes.table/groups.hbs +11 -11
  18. package/module/settings/card/admin.routes.table/users.hbs +16 -16
  19. package/module/settings/cls/core.actions.json +17 -17
  20. package/module/settings/cls/core.scope.json +13 -13
  21. package/module/settings/cls/properties.site_status.json +13 -13
  22. package/module/settings/cls/properties.widget_status.json +13 -13
  23. package/module/settings/cls/users.user_type.json +13 -13
  24. package/module/settings/cls/yes_no.json +11 -11
  25. package/module/settings/form/admin.accounts.form.json +13 -13
  26. package/module/settings/form/admin.properties.form.json +15 -15
  27. package/module/settings/form/admin.roles.form.json +21 -21
  28. package/module/settings/form/admin.user_properties.form.json +15 -15
  29. package/module/settings/form/admin.user_roles_card.form.json +13 -13
  30. package/module/settings/interface/admin.properties.json +4 -4
  31. package/module/settings/interface/admin.roles.json +4 -4
  32. package/module/settings/interface/admin.routes.json +4 -4
  33. package/module/settings/interface/admin.users.json +4 -4
  34. package/module/settings/select/core.routes.sql +1 -1
  35. package/module/settings/select/core.user_mentioned.sql +1 -1
  36. package/module/settings/select/core.user_uid.sql +1 -1
  37. package/module/settings/table/admin.properties.table.json +39 -39
  38. package/module/settings/table/admin.user_properties.table.json +34 -34
  39. package/package.json +3 -3
  40. package/server/helpers/core/badge.js +16 -16
  41. package/server/helpers/core/buttonHelper.js +21 -21
  42. package/server/helpers/core/coalesce.js +7 -7
  43. package/server/helpers/core/select.js +48 -48
  44. package/server/helpers/core/token.js +18 -18
  45. package/server/helpers/list/buttonHelper.js +21 -21
  46. package/server/helpers/list/utils/button.js +5 -5
  47. package/server/helpers/temp/contentList.js +58 -58
  48. package/server/helpers/temp/ifCond.js +101 -101
  49. package/server/helpers/utils/button.js +5 -5
  50. package/server/helpers/utils/mdToHTML.js +17 -17
  51. package/server/plugins/access/index.mjs +6 -6
  52. package/server/plugins/adminHook.js +81 -81
  53. package/server/plugins/cron.js +10 -10
  54. package/server/plugins/docs.js +28 -28
  55. package/server/routes/access/controllers/access.group.js +29 -29
  56. package/server/routes/access/controllers/access.group.post.js +54 -54
  57. package/server/routes/access/index.mjs +11 -11
  58. package/server/routes/access/schema.mjs +67 -67
  59. package/server/routes/calendar/controllers/calendar.data.js +125 -125
  60. package/server/routes/calendar/index.mjs +7 -7
  61. package/server/routes/calendar/schema.js +21 -21
  62. package/server/routes/data/controllers/cardTabData.js +49 -49
  63. package/server/routes/data/controllers/funcs/getFilterSQL/index.js +92 -92
  64. package/server/routes/data/controllers/funcs/getFilterSQL/util/formatValue.js +170 -170
  65. package/server/routes/data/controllers/funcs/getFilterSQL/util/getCustomQuery.js +13 -13
  66. package/server/routes/data/controllers/funcs/getFilterSQL/util/getFilterQuery.js +64 -64
  67. package/server/routes/data/controllers/funcs/getFilterSQL/util/getOptimizedQuery.js +12 -12
  68. package/server/routes/data/controllers/funcs/getFilterSQL/util/getTableSql.js +34 -34
  69. package/server/routes/data/controllers/tableDataId.js +27 -27
  70. package/server/routes/data/controllers/tokenInfo.js +9 -9
  71. package/server/routes/data/controllers/utils/assignTokens.js +30 -30
  72. package/server/routes/data/controllers/utils/conditions.js +20 -20
  73. package/server/routes/data/controllers/utils/getColumns.js +8 -8
  74. package/server/routes/data/index.mjs +20 -20
  75. package/server/routes/data/schema.js +54 -54
  76. package/server/routes/notifications/controllers/readNotifications.js +18 -27
  77. package/server/routes/notifications/controllers/testEmail.js +35 -35
  78. package/server/routes/notifications/controllers/userNotifications.js +53 -53
  79. package/server/routes/notifications/hook/onWidgetSet.js +56 -56
  80. package/server/routes/notifications/index.mjs +26 -26
  81. package/server/routes/notifications/schema.js +16 -16
  82. package/server/routes/print/controllers/cardPrint.js +135 -135
  83. package/server/routes/properties/schema.js +10 -10
  84. package/server/routes/report/controllers/data.js +76 -76
  85. package/server/routes/report/controllers/list.js +18 -18
  86. package/server/routes/report/index.mjs +7 -7
  87. package/server/routes/report/utils/formatValue.js +179 -179
  88. package/server/routes/root.mjs +3 -3
  89. package/server/routes/templates/controllers/getTemplate.js +44 -44
  90. package/server/routes/templates/schema.js +8 -8
  91. package/server/routes/user/controllers/user.cls.id.js +14 -14
  92. package/server/routes/user/controllers/user.cls.js +72 -72
  93. package/server/routes/user/controllers/user.info.js +17 -17
  94. package/server/routes/user/schema.js +14 -14
  95. package/server/routes/util/controllers/code.generator.js +89 -89
  96. package/server/routes/widget/controllers/widget.del.js +80 -63
  97. package/server/routes/widget/controllers/widget.get.js +12 -7
  98. package/server/routes/widget/controllers/widget.set.js +93 -84
  99. package/server/routes/widget/hook/onWidgetSet.js +12 -12
  100. package/server/routes/widget/index.mjs +16 -16
  101. package/server/routes/widget/schema.js +12 -12
  102. package/server/templates/cls/itree.recrzone_category.json +73 -73
  103. package/server/templates/cls/test.json +9 -9
  104. package/server/templates/form/admin.user_cls.data.form.json +49 -49
  105. package/server/templates/form/admin.user_group_rel.form.json +21 -21
  106. package/server/templates/form/form-user-pass.json +10 -10
  107. package/server/templates/form/form-user_group.json +39 -39
  108. package/server/templates/form/form-users.json +156 -156
  109. package/server/templates/form/user_group_access.form.json +22 -22
  110. package/server/templates/select/account_id.json +2 -2
  111. package/server/templates/table/gis.dataset.table.json +43 -43
  112. package/server/templates/table/management.user_group.table.json +112 -112
  113. package/server/templates/table/management.users.table.json +126 -126
  114. package/server/{routes/notifications/funcs → utils}/addNotification.js +21 -21
  115. package/server/utils/isAdmin.js +8 -0
  116. package/server/{routes/notifications/funcs → utils}/sendNotification.js +89 -92
  117. package/utils.js +4 -3
  118. /package/server/{routes/notifications/funcs/utils → utils}/sendEmail.js +0 -0
@@ -1,17 +1,17 @@
1
- export default async function userInfo({
2
- pg, session = {},
3
- }) {
4
- const { uid } = session.passport?.user || {};
5
-
6
- if (!uid) {
7
- return { message: 'access restricted', status: 403 };
8
- }
9
-
10
- const data = await pg.query(`select user_name, sur_name, father_name, user_rnokpp, user_type, email, login from admin.users
11
- where uid=$1`, [uid]).then((res) => res.rows?.[0] || {});
12
-
13
- const { notifications = 0 } = await pg.query(`select count(*)::int as notifications from crm.notifications
14
- where addressee_id=$1 and read is not true`, [uid]).then((res) => res.rows?.[0] || {});
15
- return { uid, ...data, notifications };
16
-
17
- }
1
+ export default async function userInfo({
2
+ pg, session = {},
3
+ }) {
4
+ const { uid } = session.passport?.user || {};
5
+
6
+ if (!uid) {
7
+ return { message: 'access restricted', status: 403 };
8
+ }
9
+
10
+ const data = await pg.query(`select user_name, sur_name, father_name, user_rnokpp, user_type, email, login from admin.users
11
+ where uid=$1`, [uid]).then((res) => res.rows?.[0] || {});
12
+
13
+ const { notifications = 0 } = await pg.query(`select count(*)::int as notifications from crm.notifications
14
+ where addressee_id=$1 and read is not true`, [uid]).then((res) => res.rows?.[0] || {});
15
+ return { uid, ...data, notifications };
16
+
17
+ }
@@ -1,14 +1,14 @@
1
- const userClsSchema = {
2
- quertstring: {
3
- sql: { type: 'string', pattern: '^(\\d)$' },
4
- },
5
- };
6
-
7
- const userClsIdSchema = {
8
- params: {
9
- id: { type: 'string', pattern: '^([\\d\\w\\.]+)$' },
10
- },
11
- };
12
-
13
- export { userClsSchema, userClsIdSchema };
14
- export default null;
1
+ const userClsSchema = {
2
+ quertstring: {
3
+ sql: { type: 'string', pattern: '^(\\d)$' },
4
+ },
5
+ };
6
+
7
+ const userClsIdSchema = {
8
+ params: {
9
+ id: { type: 'string', pattern: '^([\\d\\w\\.]+)$' },
10
+ },
11
+ };
12
+
13
+ export { userClsSchema, userClsIdSchema };
14
+ export default null;
@@ -1,89 +1,89 @@
1
- import { getTemplate, handlebarsSync, pgClients, getToken } from "@opengis/fastify-table/utils.js";
2
-
3
- function dayOfTheYear(date) {
4
- const start = new Date(date.getFullYear(), 0, 0);
5
- const diff = (date - start) + ((start.getTimezoneOffset() - date.getTimezoneOffset()) * 60 * 1000);
6
- const oneDay = 1000 * 60 * 60 * 24;
7
- const day = Math.floor(diff / oneDay);
8
- return day;
9
- }
10
-
11
- export default async function codeGenerator({
12
- pg = pgClients.client, params = {}, user = {}, query = {},
13
- }, reply) {
14
- const { token, column } = params;
15
- const data = query.data?.split?.(';') || [];
16
-
17
- if (!token || !column) {
18
- return reply.status(400).send('not enough params: token / column');
19
- }
20
-
21
- if (!user?.uid) {
22
- return reply.status(401).send('access restricted: token');
23
- }
24
-
25
- const tokenData = await getToken({ token, uid: user?.uid, json: 1 }) || {};
26
-
27
- if (!tokenData?.form || !tokenData?.table) {
28
- return reply.status(401).send('token not allow');
29
- }
30
-
31
- const loadTemplate = await getTemplate('form', tokenData.form);
32
- const schema = loadTemplate?.schema || loadTemplate;
33
-
34
- if (!schema) {
35
- return reply.status(404).send('form not found');
36
- }
37
-
38
- if (!schema?.[column]?.template) {
39
- return reply.status(400).send('template not specified');
40
- }
41
-
42
- const columnValue = data.find(el => el.startsWith(column))?.split('=')?.pop();
43
-
44
- const loadTable = await getTemplate('table', tokenData.table);
45
- const table = loadTable?.table || tokenData.table;
46
-
47
- if (!pg.pk?.[table]) {
48
- return reply.status(404).send('table pk not found');
49
- }
50
-
51
- const { count = 0 } = await pg.query(
52
- `select count(*) from ${table} where ${columnValue ? `${column}::text = '${columnValue}'` : 'true'} limit 1`,
53
- ).then(el => el.rows?.[0] || {});
54
-
55
- const { NUMY = 0 } = await pg.query(
56
- `select ${column} as "NUMY" from ${table} where ${column} is not null and date_part('year', cdate) = $1 order by cdate desc limit 1`,
57
- [(new Date()).getFullYear()]
58
- ).then(el => el.rows?.[0] || {});
59
-
60
- const date = new Date();
61
-
62
- const template = schema[column].template.match(/NUM[M|Y] \d/g)
63
- .reduce((acc, curr) => acc.replace(
64
- curr.startsWith('{{{') ? `{{{${curr}}}}` : `{{${curr}}}`,
65
- handlebarsSync.compile(`{{paddingNumber value padding}}`)({ padding: curr.substring(4, curr.length)?.trim?.(), value: curr.startsWith('NUMY') ? NUMY : +count + 1 })),
66
- schema[column].template
67
- );
68
- const result = handlebarsSync.compile(template)({
69
- HH: date.getHours(), // hours 24h: 14:00 = 14
70
- HH12: (date.getHours() + 24) % 12 || 12, // hours 12h: 14:00 = 2
71
- HH24: date.getHours(), // hours 24h: 14:00 = 14
72
- MI: date.getMinutes(), // minutes
73
- SS: date.getSeconds(), // seconds
74
-
75
- YYYY: date.getFullYear(), // full year: 2025
76
- YY: date.getFullYear().toString().substring(2, 4), // last 2 digits of year: 25
77
-
78
- MONTH: date.toLocaleString('en', { month: 'long' }).toUpperCase(), // month name: MARCH
79
- MON: date.toLocaleString('en', { month: 'long' }).substring(0, 3).toUpperCase(), // month name abbrev: MAR
80
- MM: date.getMonth() + 1, // month number: 1 - january, 12 - december
81
-
82
- D: date.getDay(), // day of the week: 1 - monday, 7 - sunday
83
- DD: date.getDate(), // day of the month: january 4 = 4
84
- DDD: dayOfTheYear(date), // day of the year: march 4 = 63
85
- ...data,
86
- });
87
-
88
- return reply.status(200).send(result);
89
- }
1
+ import { getTemplate, handlebarsSync, pgClients, getToken } from "@opengis/fastify-table/utils.js";
2
+
3
+ function dayOfTheYear(date) {
4
+ const start = new Date(date.getFullYear(), 0, 0);
5
+ const diff = (date - start) + ((start.getTimezoneOffset() - date.getTimezoneOffset()) * 60 * 1000);
6
+ const oneDay = 1000 * 60 * 60 * 24;
7
+ const day = Math.floor(diff / oneDay);
8
+ return day;
9
+ }
10
+
11
+ export default async function codeGenerator({
12
+ pg = pgClients.client, params = {}, user = {}, query = {},
13
+ }, reply) {
14
+ const { token, column } = params;
15
+ const data = query.data?.split?.(';') || [];
16
+
17
+ if (!token || !column) {
18
+ return reply.status(400).send('not enough params: token / column');
19
+ }
20
+
21
+ if (!user?.uid) {
22
+ return reply.status(401).send('access restricted: token');
23
+ }
24
+
25
+ const tokenData = await getToken({ token, uid: user?.uid, json: 1 }) || {};
26
+
27
+ if (!tokenData?.form || !tokenData?.table) {
28
+ return reply.status(401).send('token not allow');
29
+ }
30
+
31
+ const loadTemplate = await getTemplate('form', tokenData.form);
32
+ const schema = loadTemplate?.schema || loadTemplate;
33
+
34
+ if (!schema) {
35
+ return reply.status(404).send('form not found');
36
+ }
37
+
38
+ if (!schema?.[column]?.template) {
39
+ return reply.status(400).send('template not specified');
40
+ }
41
+
42
+ const columnValue = data.find(el => el.startsWith(column))?.split('=')?.pop();
43
+
44
+ const loadTable = await getTemplate('table', tokenData.table);
45
+ const table = loadTable?.table || tokenData.table;
46
+
47
+ if (!pg.pk?.[table]) {
48
+ return reply.status(404).send('table pk not found');
49
+ }
50
+
51
+ const { count = 0 } = await pg.query(
52
+ `select count(*) from ${table} where ${columnValue ? `${column}::text = '${columnValue}'` : 'true'} limit 1`,
53
+ ).then(el => el.rows?.[0] || {});
54
+
55
+ const { NUMY = 0 } = await pg.query(
56
+ `select ${column} as "NUMY" from ${table} where ${column} is not null and date_part('year', cdate) = $1 order by cdate desc limit 1`,
57
+ [(new Date()).getFullYear()]
58
+ ).then(el => el.rows?.[0] || {});
59
+
60
+ const date = new Date();
61
+
62
+ const template = schema[column].template.match(/NUM[M|Y] \d/g)
63
+ .reduce((acc, curr) => acc.replace(
64
+ curr.startsWith('{{{') ? `{{{${curr}}}}` : `{{${curr}}}`,
65
+ handlebarsSync.compile(`{{paddingNumber value padding}}`)({ padding: curr.substring(4, curr.length)?.trim?.(), value: curr.startsWith('NUMY') ? NUMY : +count + 1 })),
66
+ schema[column].template
67
+ );
68
+ const result = handlebarsSync.compile(template)({
69
+ HH: date.getHours(), // hours 24h: 14:00 = 14
70
+ HH12: (date.getHours() + 24) % 12 || 12, // hours 12h: 14:00 = 2
71
+ HH24: date.getHours(), // hours 24h: 14:00 = 14
72
+ MI: date.getMinutes(), // minutes
73
+ SS: date.getSeconds(), // seconds
74
+
75
+ YYYY: date.getFullYear(), // full year: 2025
76
+ YY: date.getFullYear().toString().substring(2, 4), // last 2 digits of year: 25
77
+
78
+ MONTH: date.toLocaleString('en', { month: 'long' }).toUpperCase(), // month name: MARCH
79
+ MON: date.toLocaleString('en', { month: 'long' }).substring(0, 3).toUpperCase(), // month name abbrev: MAR
80
+ MM: date.getMonth() + 1, // month number: 1 - january, 12 - december
81
+
82
+ D: date.getDay(), // day of the week: 1 - monday, 7 - sunday
83
+ DD: date.getDate(), // day of the month: january 4 = 4
84
+ DDD: dayOfTheYear(date), // day of the year: march 4 = 63
85
+ ...data,
86
+ });
87
+
88
+ return reply.status(200).send(result);
89
+ }
@@ -1,63 +1,80 @@
1
- import { isFileExists } from "@opengis/fastify-file/utils.js";
2
-
3
- async function checkAccess(pg, objectid, id) {
4
- 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])
5
- .then(el => el.rows?.[0] || {});
6
- return { uid, exists: filepath ? await isFileExists(filepath) : null };
7
- }
8
-
9
- /**
10
- * Дістає CRM дані для vue хешує ідентифікатори, підтягує селекти
11
- *
12
- * @method DELETE
13
- * @summary CRM дані для обраного віджета.
14
- * @priority 2
15
- * @tag table
16
- * @type api
17
- * @requires setTokenById
18
- * @requires getSelect
19
- * @param {String} id Ідентифікатор для хешування
20
- * @param {Any} sql Використовується для повернення sql запиту
21
- * @param {String} type Тип для хешування даних
22
- * @errors 400, 500
23
- * @returns {Number} status Номер помилки
24
- * @returns {String|Object} error Опис помилки
25
- * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
26
- */
27
-
28
- import { pgClients, logChanges } from "@opengis/fastify-table/utils.js";
29
-
30
- export default async function widgetDel({
31
- pg = pgClients.client, params = {}, session = {},
32
- }, reply) {
33
- const { user = {} } = session.passport || {};
34
- if (!user.uid) return { error: 'access restricted', status: 403 };
35
- const { type, objectid, id } = params;
36
-
37
- if (!objectid) return { error: 'id required', status: 400 };
38
-
39
- // force delete db entry if file not exists
40
- const { exists, uid } = ['file', 'gallery'].includes(type) ? await checkAccess(pg, objectid, id) : {};
41
-
42
- if (exists && !user?.user_type?.includes?.('admin') && uid && user?.uid !== uid) {
43
- return reply.status(403).send('access restricted: file exists, not an author');
44
- }
45
-
46
- const sqls = {
47
- comment: 'delete from crm.communications where entity_id=$1 and uid=$2 and communication_id=$3',
48
- checklist: 'delete from crm.checklists where entity_id=$1 and uid=$2 and checklist_id=$3',
49
- 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`,
50
- 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`,
51
- };
52
- const sql = sqls[type];
53
- // console.log(sql);
54
- if (!sql) return reply.status(400).send('type not valid');
55
-
56
- const { rows = [] } = await pg.query(sql, [objectid, user.uid, id]);
57
- const table = { comment: 'crm.communications', checklist: 'crm.checklists', file: 'crm.files', gallery: 'crm.files' }[type];
58
- await logChanges({
59
- pg, table, id, data: rows[0], uid: user?.uid, type: 'DELETE',
60
- });
61
- return { data: { id }, user: { uid: user.uid, name: user.user_name } };
62
-
63
- }
1
+ import { pgClients, logChanges } from "@opengis/fastify-table/utils.js";
2
+ import { isFileExists } from "@opengis/fastify-file/utils.js";
3
+
4
+ import { isAdmin } from "../../../../utils.js";
5
+
6
+ async function checkAccess(pg, objectid, id) {
7
+ 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])
8
+ .then(el => el.rows?.[0] || {});
9
+ return { uid, exists: filepath ? await isFileExists(filepath) : null };
10
+ }
11
+
12
+ /**
13
+ * Дістає CRM дані для vue хешує ідентифікатори, підтягує селекти
14
+ *
15
+ * @method DELETE
16
+ * @summary CRM дані для обраного віджета.
17
+ * @priority 2
18
+ * @tag table
19
+ * @type api
20
+ * @requires setTokenById
21
+ * @requires getSelect
22
+ * @param {String} id Ідентифікатор для хешування
23
+ * @param {Any} sql Використовується для повернення sql запиту
24
+ * @param {String} type Тип для хешування даних
25
+ * @errors 400, 500
26
+ * @returns {Number} status Номер помилки
27
+ * @returns {String|Object} error Опис помилки
28
+ * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
29
+ */
30
+
31
+ export default async function widgetDel(req, reply) {
32
+ const {
33
+ pg = pgClients.client, params = {}, user = {},
34
+ } = req;
35
+
36
+ if (!user?.uid) {
37
+ return reply.status(401).send('access restricted: user not authorized');
38
+ }
39
+
40
+ const { type, objectid, id } = params;
41
+
42
+ if (!objectid) {
43
+ return reply.status(400).send('not enough params: id');
44
+ }
45
+
46
+ // force delete db entry if file not exists
47
+ const { exists, uid } = ['file', 'gallery'].includes(type) ? await checkAccess(pg, objectid, id) : {};
48
+
49
+ if (exists && !isAdmin(req) && uid && user?.uid !== uid) {
50
+ return reply.status(403).send('access restricted: file exists, not an author');
51
+ }
52
+
53
+ const sqls = {
54
+ comment: `delete from crm.communications where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and communication_id=$3`,
55
+ checklist: `delete from crm.checklists where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and checklist_id=$3`,
56
+ 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`,
57
+ 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`,
58
+ };
59
+
60
+ const sql = sqls[type];
61
+ const table = {
62
+ comment: 'crm.communications',
63
+ checklist: 'crm.checklists',
64
+ file: 'crm.files',
65
+ gallery: 'crm.files',
66
+ }[type];
67
+
68
+ if (!sql) {
69
+ return reply.status(400).send('invalid widget type');
70
+ }
71
+
72
+ const { rows = [] } = await pg.query(sql, [objectid, user.uid, id]);
73
+
74
+ await logChanges({
75
+ pg, table, id, data: rows[0], uid: user?.uid, type: 'DELETE',
76
+ });
77
+
78
+ return { data: { id }, user: { uid: user.uid, name: user.user_name } };
79
+
80
+ }
@@ -9,8 +9,8 @@ const username = `coalesce(u.sur_name,'')||coalesce(' '||u.user_name,'') ||coale
9
9
  */
10
10
 
11
11
  export default async function widgetGet({
12
- pg = pgClients.client, user = {}, params = {}, query = {},
13
- }) {
12
+ pg = pgClients.client, user = {}, params = {}, query = {}, unittest,
13
+ }, reply) {
14
14
  const param = user?.uid ? await getToken({
15
15
  token: params.objectid, mode: 'w', uid: user.uid,
16
16
  }) : null;
@@ -18,7 +18,7 @@ export default async function widgetGet({
18
18
  const objectid = param ? JSON.parse(param)?.id : params.objectid;
19
19
 
20
20
  if (!objectid) {
21
- return { message: 'id required', status: 400 };
21
+ return reply.status(400).send('not enough params: id');
22
22
  }
23
23
 
24
24
  const sqls = {
@@ -87,10 +87,11 @@ export default async function widgetGet({
87
87
  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`,
88
88
 
89
89
  };
90
+
90
91
  const sql = sqls[params.type];
91
92
 
92
93
  if (!sql) {
93
- return { message: 'param type not valid', status: 400 };
94
+ return reply.status(400).send('invalid widget type');
94
95
  }
95
96
 
96
97
 
@@ -101,13 +102,17 @@ export default async function widgetGet({
101
102
  time.push(Date.now());
102
103
 
103
104
  /* Object info */
104
- const { tableName } = pg.pk['log.table_changes'] ? await pg.one('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid]) : {};
105
- const { pk } = await getMeta({ table: tableName });
105
+ 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] || {}) : {};
106
+ const { pk } = await getMeta({ pg, table: tableName });
107
+
108
+ if (!pk && !unittest) {
109
+ return reply.status(404).send('table not found');
110
+ }
106
111
 
107
112
  const q = tableName && pg.pk['admin.users'] ? `select ${username} as author, u.login, a.cdate, a.editor_date from ${tableName} a
108
113
  left join admin.users u on a.uid=u.uid where a.${pk}=$1 limit 1` : undefined;
109
114
 
110
- const data = pk && q ? await pg.one(q, [objectid]) : {};
115
+ const data = pk && q ? await pg.query(q, [objectid]).then(el => el.rows?.[0] || {}) : {};
111
116
 
112
117
  if (query.debug && user?.user_type === 'admin') {
113
118
  return {
@@ -1,84 +1,93 @@
1
- import path from 'path';
2
-
3
- import {
4
- getMeta, dataInsert, dataUpdate, applyHook,
5
- } from '@opengis/fastify-table/utils.js';
6
-
7
- import { uploadMultiPart } from '@opengis/fastify-file/utils.js';
8
-
9
- const tableList = {
10
- comment: 'crm.communications',
11
- gallery: 'crm.files',
12
- checklist: 'crm.checklists',
13
- };
14
- const pkList = {
15
- comment: 'communication_id',
16
- checklist: 'checklist_id',
17
- gallery: 'file_id',
18
- };
19
-
20
- const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
21
-
22
- export default async function widgetSet(req) {
23
- const {
24
- pg, params = {}, session = {}, body = {},
25
- } = req;
26
- const { user = {} } = session.passport || {};
27
- const { type, id, objectid } = params;
28
- if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) return { message: 'param type not valid', status: 400 };
29
- if (!objectid) return { message: 'id required', status: 400 };
30
-
31
- const table = tableList[type];
32
-
33
- // dsadasdad
34
- if (['gallery', 'file'].includes(type) && req.headers['content-type'].split(';').shift() === "multipart/form-data") {
35
- const file = await uploadMultiPart(req);
36
- const extName = path.extname(file.filepath).slice(1).toLowerCase();
37
-
38
- const data = {
39
- uploaded_name: file?.originalFilename?.toLocaleLowerCase()?.replace(/'/g, '\'\''),
40
- file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
41
- ext: extName,
42
- size: file?.size,
43
- file_status: 1,
44
- uid: user?.uid || 1,
45
- entity_id: objectid,
46
- };
47
-
48
- if (type === 'gallery' && !galleryExtList.includes(extName.toLowerCase())) {
49
- return { message: 'invalid file extension', status: 400 };
50
- }
51
-
52
- const { rows = [] } = await dataInsert({
53
- table: 'crm.files', data, uid: user?.uid,
54
- });
55
- return {
56
- rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
57
- };
58
- }
59
- const { pk } = await getMeta({ pg, table });
60
- if (!pk) return { message: 'table not found', status: 404 };
61
-
62
- const data = { ...body, uid: user?.uid, entity_id: objectid };
63
-
64
- await applyHook('onWidgetSet', {
65
- link: req.path,
66
- id,
67
- objectid,
68
- session,
69
- type,
70
- payload: data,
71
- });
72
-
73
- const result = id
74
- ? await dataUpdate({
75
- table, data, id, uid: user?.uid,
76
- })
77
- : await dataInsert({
78
- table, data, uid: user?.uid,
79
- });
80
-
81
- return {
82
- rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
83
- };
84
- }
1
+ import path from 'path';
2
+
3
+ import {
4
+ getMeta, dataInsert, dataUpdate, applyHook,
5
+ } from '@opengis/fastify-table/utils.js';
6
+
7
+ import { uploadMultiPart } from '@opengis/fastify-file/utils.js';
8
+
9
+ const tableList = {
10
+ comment: 'crm.communications',
11
+ gallery: 'crm.files',
12
+ checklist: 'crm.checklists',
13
+ };
14
+ const pkList = {
15
+ comment: 'communication_id',
16
+ checklist: 'checklist_id',
17
+ gallery: 'file_id',
18
+ };
19
+
20
+ const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
21
+
22
+ export default async function widgetSet(req, reply) {
23
+ const {
24
+ pg, params = {}, session = {}, body = {}, user = {},
25
+ } = req;
26
+ const { type, id, objectid } = params;
27
+
28
+ if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) {
29
+ return reply.status(400).send('param type not valid');
30
+ }
31
+
32
+ if (!objectid) {
33
+ return reply.status(400).send('not enough params: id');
34
+ }
35
+
36
+ const table = tableList[type];
37
+
38
+ // dsadasdad
39
+ if (['gallery', 'file'].includes(type) && req.headers['content-type'].split(';').shift() === "multipart/form-data") {
40
+ const file = await uploadMultiPart(req);
41
+ const extName = path.extname(file.filepath).slice(1).toLowerCase();
42
+
43
+ const data = {
44
+ uploaded_name: file?.originalFilename?.toLocaleLowerCase()?.replace(/'/g, '\'\''),
45
+ file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
46
+ ext: extName,
47
+ size: file?.size,
48
+ file_status: 1,
49
+ uid: user?.uid || 1,
50
+ entity_id: objectid,
51
+ };
52
+
53
+ if (type === 'gallery' && !galleryExtList.includes(extName.toLowerCase())) {
54
+ return reply.status(400).send('invalid file extension');
55
+ }
56
+
57
+ const { rows = [] } = await dataInsert({
58
+ pg, table: 'crm.files', data, uid: user?.uid,
59
+ });
60
+ return {
61
+ rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
62
+ };
63
+ }
64
+ const { pk } = await getMeta({ pg, table });
65
+
66
+ if (!pk) {
67
+ return reply.status(404).send('table not found');
68
+ }
69
+
70
+ const data = { ...body, uid: user?.uid, entity_id: objectid };
71
+
72
+ await applyHook('onWidgetSet', {
73
+ pg,
74
+ link: req.path,
75
+ id,
76
+ objectid,
77
+ session,
78
+ type,
79
+ payload: data,
80
+ });
81
+
82
+ const result = id
83
+ ? await dataUpdate({
84
+ pg, table, data, id, uid: user?.uid,
85
+ })
86
+ : await dataInsert({
87
+ pg, table, data, uid: user?.uid,
88
+ });
89
+
90
+ return {
91
+ rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
92
+ };
93
+ }
@@ -1,12 +1,12 @@
1
- import { pgClients } from '@opengis/fastify-table/utils.js';
2
-
3
- export default async function onWidgetSet({
4
- pg = pgClients.client, id, objectid, type, payload = {},
5
- }) {
6
- if (!id || !objectid || type !== 'gallery') {
7
- return null;
8
- }
9
- if (payload?.ismain) {
10
- await pg.query('update crm.files set ismain=false where entity_id=$1 and file_id<>$2', [objectid, id]);
11
- }
12
- }
1
+ import { pgClients } from '@opengis/fastify-table/utils.js';
2
+
3
+ export default async function onWidgetSet({
4
+ pg = pgClients.client, id, objectid, type, payload = {},
5
+ }) {
6
+ if (!id || !objectid || type !== 'gallery') {
7
+ return null;
8
+ }
9
+ if (payload?.ismain) {
10
+ await pg.query('update crm.files set ismain=false where entity_id=$1 and file_id<>$2', [objectid, id]);
11
+ }
12
+ }