@opengis/fastify-table 1.2.69 → 1.2.70
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.
- package/README.md +86 -86
- package/package.json +1 -1
- package/server/migrations/cls.sql +39 -39
- package/server/plugins/cron/funcs/addCron.js +130 -130
- package/server/plugins/cron/index.js +6 -6
- package/server/plugins/crud/funcs/getOpt.js +13 -13
- package/server/plugins/crud/funcs/setOpt.js +21 -21
- package/server/plugins/crud/funcs/setToken.js +44 -44
- package/server/plugins/crud/funcs/utils/getFolder.js +11 -11
- package/server/plugins/crud/index.js +23 -23
- package/server/plugins/hook/index.js +8 -8
- package/server/plugins/logger/errorStatus.js +19 -19
- package/server/plugins/logger/index.js +26 -26
- package/server/plugins/migration/index.js +7 -7
- package/server/plugins/pg/funcs/init.js +2 -1
- package/server/plugins/policy/sqlInjection.js +33 -33
- package/server/plugins/redis/client.js +8 -8
- package/server/plugins/redis/funcs/redisClients.js +3 -3
- package/server/plugins/redis/index.js +17 -17
- package/server/plugins/table/funcs/getFilterSQL/index.js +7 -6
- package/server/plugins/table/funcs/getFilterSQL/util/getCustomQuery.js +13 -13
- package/server/plugins/table/funcs/getFilterSQL/util/getTableSql.js +34 -34
- package/server/plugins/table/funcs/getTemplates.js +19 -19
- package/server/plugins/table/funcs/gisIRColumn.js +82 -82
- package/server/plugins/table/funcs/loadTemplate.js +1 -1
- package/server/plugins/table/funcs/loadTemplatePath.js +1 -1
- package/server/plugins/table/funcs/metaFormat/getSelectVal.js +3 -1
- package/server/plugins/table/funcs/userTemplateDir.js +1 -1
- package/server/plugins/table/index.js +13 -13
- package/server/plugins/util/index.js +7 -7
- package/server/routes/cron/index.js +14 -14
- package/server/routes/crud/controllers/table.js +92 -92
- package/server/routes/logger/controllers/logger.file.js +92 -92
- package/server/routes/logger/controllers/utils/checkUserAccess.js +19 -19
- package/server/routes/logger/controllers/utils/getRootDir.js +26 -26
- package/server/routes/logger/index.js +17 -17
- package/server/routes/properties/controllers/properties.add.js +55 -55
- package/server/routes/properties/controllers/properties.get.js +17 -17
- package/server/routes/properties/index.js +16 -16
- package/server/routes/table/controllers/data.js +20 -11
- package/server/routes/table/controllers/form.js +42 -42
- package/server/routes/table/controllers/search.js +74 -74
- package/server/routes/table/index.js +29 -29
- package/server/routes/table/schema.js +64 -64
- package/server/routes/util/controllers/status.monitor.js +8 -8
- package/server/routes/util/index.js +11 -11
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import config from '../../../../../config.js';
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
*
|
|
5
|
-
* @summary check user access to logger interface - per admin user type or user group
|
|
6
|
-
* @returns {Object} message, status
|
|
7
|
-
*/
|
|
8
|
-
|
|
9
|
-
export default function checkUserAccess({ user = {} }) {
|
|
10
|
-
// console.log(user);
|
|
11
|
-
if (user.user_type !== 'admin' && !config?.local) {
|
|
12
|
-
return { message: 'access restricted', status: 403 };
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
/* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
|
|
16
|
-
return { message: 'access restricted', status: 403 };
|
|
17
|
-
} */
|
|
18
|
-
return { message: 'access granted', status: 200 };
|
|
19
|
-
}
|
|
1
|
+
import config from '../../../../../config.js';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
*
|
|
5
|
+
* @summary check user access to logger interface - per admin user type or user group
|
|
6
|
+
* @returns {Object} message, status
|
|
7
|
+
*/
|
|
8
|
+
|
|
9
|
+
export default function checkUserAccess({ user = {} }) {
|
|
10
|
+
// console.log(user);
|
|
11
|
+
if (user.user_type !== 'admin' && !config?.local) {
|
|
12
|
+
return { message: 'access restricted', status: 403 };
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
/* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
|
|
16
|
+
return { message: 'access restricted', status: 403 };
|
|
17
|
+
} */
|
|
18
|
+
return { message: 'access granted', status: 200 };
|
|
19
|
+
}
|
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
import fs from 'node:fs';
|
|
2
|
-
import path from 'node:path';
|
|
3
|
-
|
|
4
|
-
import config from '../../../../../config.js';
|
|
5
|
-
|
|
6
|
-
// import { existsSync } from 'fs';
|
|
7
|
-
let logDir = null;
|
|
8
|
-
export default function getRootDir() {
|
|
9
|
-
// absolute / relative path
|
|
10
|
-
if (logDir) return logDir;
|
|
11
|
-
const file = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
|
|
12
|
-
const root = file === 'config.json' ? process.cwd() : '/data/local';
|
|
13
|
-
logDir = config.logDir || path.join(root, config.log?.dir || 'log');
|
|
14
|
-
console.log({ logDir });
|
|
15
|
-
return logDir;
|
|
16
|
-
|
|
17
|
-
// windows debug support
|
|
18
|
-
/* const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
|
|
19
|
-
// docker default path
|
|
20
|
-
if (existsSync(customLogDir)) {
|
|
21
|
-
return path.join(customLogDir, config.folder || '', 'log');
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
// non-docker default path
|
|
25
|
-
return path.join(config.root || '/data/local', config.folder || '', 'log'); */
|
|
26
|
-
}
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
|
|
4
|
+
import config from '../../../../../config.js';
|
|
5
|
+
|
|
6
|
+
// import { existsSync } from 'fs';
|
|
7
|
+
let logDir = null;
|
|
8
|
+
export default function getRootDir() {
|
|
9
|
+
// absolute / relative path
|
|
10
|
+
if (logDir) return logDir;
|
|
11
|
+
const file = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
|
|
12
|
+
const root = file === 'config.json' ? process.cwd() : '/data/local';
|
|
13
|
+
logDir = config.logDir || path.join(root, config.log?.dir || 'log');
|
|
14
|
+
console.log({ logDir });
|
|
15
|
+
return logDir;
|
|
16
|
+
|
|
17
|
+
// windows debug support
|
|
18
|
+
/* const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
|
|
19
|
+
// docker default path
|
|
20
|
+
if (existsSync(customLogDir)) {
|
|
21
|
+
return path.join(customLogDir, config.folder || '', 'log');
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
// non-docker default path
|
|
25
|
+
return path.join(config.root || '/data/local', config.folder || '', 'log'); */
|
|
26
|
+
}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import loggerFile from './controllers/logger.file.js';
|
|
2
|
-
|
|
3
|
-
// import loggerTest from './controllers/logger.test.api.js';
|
|
4
|
-
|
|
5
|
-
const loggerSchema = {
|
|
6
|
-
querystring: {
|
|
7
|
-
download: { type: 'string', pattern: '^(\\d+)$' },
|
|
8
|
-
full: { type: 'string', pattern: '^(\\d+)$' },
|
|
9
|
-
dir: { type: 'string', pattern: '^(\\d+)$' },
|
|
10
|
-
},
|
|
11
|
-
};
|
|
12
|
-
|
|
13
|
-
async function plugin(fastify) {
|
|
14
|
-
fastify.get('/logger-file/*', { config: { policy: ['site'] }, schema: loggerSchema }, loggerFile);
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
export default plugin;
|
|
1
|
+
import loggerFile from './controllers/logger.file.js';
|
|
2
|
+
|
|
3
|
+
// import loggerTest from './controllers/logger.test.api.js';
|
|
4
|
+
|
|
5
|
+
const loggerSchema = {
|
|
6
|
+
querystring: {
|
|
7
|
+
download: { type: 'string', pattern: '^(\\d+)$' },
|
|
8
|
+
full: { type: 'string', pattern: '^(\\d+)$' },
|
|
9
|
+
dir: { type: 'string', pattern: '^(\\d+)$' },
|
|
10
|
+
},
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
async function plugin(fastify) {
|
|
14
|
+
fastify.get('/logger-file/*', { config: { policy: ['site'] }, schema: loggerSchema }, loggerFile);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
export default plugin;
|
|
@@ -1,55 +1,55 @@
|
|
|
1
|
-
import { dataInsert } from '../../../../utils.js';
|
|
2
|
-
|
|
3
|
-
const table = 'crm.properties';
|
|
4
|
-
|
|
5
|
-
function checkKeyType({ body, key }) {
|
|
6
|
-
if (typeof body[key] === 'number' && (!/\D/.test(body[key].toString()) && body[key].toString().length < 10)) {
|
|
7
|
-
return { [key]: 'int' };
|
|
8
|
-
} if (typeof body[key] === 'object') {
|
|
9
|
-
return { [key]: 'json' };
|
|
10
|
-
}
|
|
11
|
-
if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
|
|
12
|
-
return { [key]: 'date' };
|
|
13
|
-
}
|
|
14
|
-
return { [key]: 'text' };
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
export default async function addExtraProperties({
|
|
18
|
-
pg, params = {}, body = {}, user = {},
|
|
19
|
-
}) {
|
|
20
|
-
const { id } = params;
|
|
21
|
-
const { uid } = user;
|
|
22
|
-
if (!uid) {
|
|
23
|
-
return { message: 'access restricted: uid', status: 403 };
|
|
24
|
-
}
|
|
25
|
-
if (!id) {
|
|
26
|
-
return { message: 'not enougn params: 1', status: 400 };
|
|
27
|
-
}
|
|
28
|
-
const extraProperties = Object.keys(body);
|
|
29
|
-
if (!extraProperties.length) {
|
|
30
|
-
return { message: 'not enougn params: 2', status: 400 };
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
if (!pg.pk?.[table]) {
|
|
34
|
-
return { message: 'table not found: crm.properties', status: 400 };
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
await pg.query('delete from crm.properties where object_id=$1', [id]); // rewrite?
|
|
38
|
-
const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
|
|
39
|
-
const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
|
|
40
|
-
const propertyType = keyTypeMatch[key];
|
|
41
|
-
const { rows = [] } = await dataInsert({
|
|
42
|
-
pg,
|
|
43
|
-
table,
|
|
44
|
-
data: {
|
|
45
|
-
property_type: propertyType,
|
|
46
|
-
property_key: key,
|
|
47
|
-
object_id: id,
|
|
48
|
-
[`property_${propertyType}`]: body[key],
|
|
49
|
-
},
|
|
50
|
-
uid,
|
|
51
|
-
});
|
|
52
|
-
return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
|
|
53
|
-
}));
|
|
54
|
-
return { message: { rows: res }, status: 200 };
|
|
55
|
-
}
|
|
1
|
+
import { dataInsert } from '../../../../utils.js';
|
|
2
|
+
|
|
3
|
+
const table = 'crm.properties';
|
|
4
|
+
|
|
5
|
+
function checkKeyType({ body, key }) {
|
|
6
|
+
if (typeof body[key] === 'number' && (!/\D/.test(body[key].toString()) && body[key].toString().length < 10)) {
|
|
7
|
+
return { [key]: 'int' };
|
|
8
|
+
} if (typeof body[key] === 'object') {
|
|
9
|
+
return { [key]: 'json' };
|
|
10
|
+
}
|
|
11
|
+
if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
|
|
12
|
+
return { [key]: 'date' };
|
|
13
|
+
}
|
|
14
|
+
return { [key]: 'text' };
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
export default async function addExtraProperties({
|
|
18
|
+
pg, params = {}, body = {}, user = {},
|
|
19
|
+
}) {
|
|
20
|
+
const { id } = params;
|
|
21
|
+
const { uid } = user;
|
|
22
|
+
if (!uid) {
|
|
23
|
+
return { message: 'access restricted: uid', status: 403 };
|
|
24
|
+
}
|
|
25
|
+
if (!id) {
|
|
26
|
+
return { message: 'not enougn params: 1', status: 400 };
|
|
27
|
+
}
|
|
28
|
+
const extraProperties = Object.keys(body);
|
|
29
|
+
if (!extraProperties.length) {
|
|
30
|
+
return { message: 'not enougn params: 2', status: 400 };
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
if (!pg.pk?.[table]) {
|
|
34
|
+
return { message: 'table not found: crm.properties', status: 400 };
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
await pg.query('delete from crm.properties where object_id=$1', [id]); // rewrite?
|
|
38
|
+
const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
|
|
39
|
+
const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
|
|
40
|
+
const propertyType = keyTypeMatch[key];
|
|
41
|
+
const { rows = [] } = await dataInsert({
|
|
42
|
+
pg,
|
|
43
|
+
table,
|
|
44
|
+
data: {
|
|
45
|
+
property_type: propertyType,
|
|
46
|
+
property_key: key,
|
|
47
|
+
object_id: id,
|
|
48
|
+
[`property_${propertyType}`]: body[key],
|
|
49
|
+
},
|
|
50
|
+
uid,
|
|
51
|
+
});
|
|
52
|
+
return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
|
|
53
|
+
}));
|
|
54
|
+
return { message: { rows: res }, status: 200 };
|
|
55
|
+
}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
export default async function getExtraProperties({
|
|
2
|
-
pg, params = {},
|
|
3
|
-
}) {
|
|
4
|
-
const { id } = params;
|
|
5
|
-
if (!id) {
|
|
6
|
-
return { message: 'not enougn params', status: 400 };
|
|
7
|
-
}
|
|
8
|
-
|
|
9
|
-
const { rows = [] } = pg.pk?.['crm.properties']
|
|
10
|
-
? await pg.query(`select property_key, property_type, property_text, property_int,
|
|
11
|
-
property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
|
|
12
|
-
: {};
|
|
13
|
-
if (!rows.length) return {};
|
|
14
|
-
|
|
15
|
-
const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
|
|
16
|
-
return { message: data, status: 200 };
|
|
17
|
-
}
|
|
1
|
+
export default async function getExtraProperties({
|
|
2
|
+
pg, params = {},
|
|
3
|
+
}) {
|
|
4
|
+
const { id } = params;
|
|
5
|
+
if (!id) {
|
|
6
|
+
return { message: 'not enougn params', status: 400 };
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
const { rows = [] } = pg.pk?.['crm.properties']
|
|
10
|
+
? await pg.query(`select property_key, property_type, property_text, property_int,
|
|
11
|
+
property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
|
|
12
|
+
: {};
|
|
13
|
+
if (!rows.length) return {};
|
|
14
|
+
|
|
15
|
+
const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
|
|
16
|
+
return { message: data, status: 200 };
|
|
17
|
+
}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import getExtraProperties from './controllers/properties.get.js';
|
|
2
|
-
import addExtraProperties from './controllers/properties.add.js';
|
|
3
|
-
|
|
4
|
-
const propertiesSchema = {
|
|
5
|
-
params: {
|
|
6
|
-
id: { type: 'string', pattern: '^([\\d\\w]+)$' },
|
|
7
|
-
},
|
|
8
|
-
};
|
|
9
|
-
|
|
10
|
-
async function plugin(fastify, config = {}) {
|
|
11
|
-
const prefix = config.prefix || '/api';
|
|
12
|
-
fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
|
|
13
|
-
fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
export default plugin;
|
|
1
|
+
import getExtraProperties from './controllers/properties.get.js';
|
|
2
|
+
import addExtraProperties from './controllers/properties.add.js';
|
|
3
|
+
|
|
4
|
+
const propertiesSchema = {
|
|
5
|
+
params: {
|
|
6
|
+
id: { type: 'string', pattern: '^([\\d\\w]+)$' },
|
|
7
|
+
},
|
|
8
|
+
};
|
|
9
|
+
|
|
10
|
+
async function plugin(fastify, config = {}) {
|
|
11
|
+
const prefix = config.prefix || '/api';
|
|
12
|
+
fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
|
|
13
|
+
fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export default plugin;
|
|
@@ -19,7 +19,7 @@ export default async function dataAPI(req, reply, called) {
|
|
|
19
19
|
} = req;
|
|
20
20
|
|
|
21
21
|
const time = Date.now();
|
|
22
|
-
|
|
22
|
+
const timeArr = [Date.now()];
|
|
23
23
|
const { uid } = user;
|
|
24
24
|
|
|
25
25
|
const hookData = await applyHook('preData', {
|
|
@@ -63,7 +63,7 @@ export default async function dataAPI(req, reply, called) {
|
|
|
63
63
|
} = loadTable || tokenData;
|
|
64
64
|
|
|
65
65
|
const tableMeta = await getMeta({ pg, table });
|
|
66
|
-
|
|
66
|
+
timeArr.push(Date.now())
|
|
67
67
|
if (tableMeta?.view) {
|
|
68
68
|
if (!loadTable?.key && !tokenData?.key) return { message: `key not found: ${table}`, status: 404 };
|
|
69
69
|
Object.assign(tableMeta, { pk: loadTable?.key || tokenData?.key });
|
|
@@ -109,10 +109,10 @@ export default async function dataAPI(req, reply, called) {
|
|
|
109
109
|
uid,
|
|
110
110
|
json: 1,
|
|
111
111
|
}) : {};
|
|
112
|
-
|
|
112
|
+
timeArr.push(Date.now())
|
|
113
113
|
const keyQuery = query.key && (loadTable?.key || tokenData?.key) && !(hookData?.id || tokenData?.id || params.id) ? `${loadTable?.key || tokenData?.key}=$1` : null;
|
|
114
114
|
|
|
115
|
-
const limit = Math.min(maxLimit, +(query.limit || 20));
|
|
115
|
+
const limit = called ? (query.limit || 20) : Math.min(maxLimit, +(query.limit || 20));
|
|
116
116
|
|
|
117
117
|
const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
|
|
118
118
|
// id, query, filter
|
|
@@ -135,11 +135,9 @@ export default async function dataAPI(req, reply, called) {
|
|
|
135
135
|
const q = `select ${pk ? `"${pk}" as id,` : ''}
|
|
136
136
|
${params.id || query.key ? '*' : sqlColumns || cols || '*'}
|
|
137
137
|
${metaCols}
|
|
138
|
-
|
|
139
|
-
? `,${sql?.filter(el => el.inline && el.fields).map(el => el.fields).join(',')}` || ''
|
|
140
|
-
: ''}
|
|
138
|
+
|
|
141
139
|
${dbColumns.find((el) => el.name === 'geom' && pg.pgType?.[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : ''}
|
|
142
|
-
from (select * ${sql?.filter(el => el.inline).map(el => `,(${el.sql})`).join('') || ''} from ${table} t
|
|
140
|
+
from (select * ${sql?.filter(el => el.inline).map(el => `,(${el.sql})`).join('') || ''} from ${table} t ) t
|
|
143
141
|
${sqlTable}
|
|
144
142
|
${params.id ? cardSqlTable : ''}
|
|
145
143
|
where ${where.join(' and ') || 'true'}
|
|
@@ -152,6 +150,8 @@ export default async function dataAPI(req, reply, called) {
|
|
|
152
150
|
|
|
153
151
|
const { rows = [] } = await pg.query(q, (tokenData?.id || hookData?.id || params.id ? [tokenData?.id || hookData?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
|
|
154
152
|
|
|
153
|
+
timeArr.push(Date.now())
|
|
154
|
+
|
|
155
155
|
if (uid && rows.length && editable) {
|
|
156
156
|
rows.forEach(row => {
|
|
157
157
|
row.token = setToken({
|
|
@@ -178,15 +178,16 @@ export default async function dataAPI(req, reply, called) {
|
|
|
178
178
|
|
|
179
179
|
const counts = keyQuery || tokenData?.id || hookData?.id || params.id
|
|
180
180
|
? { total: rows.length, filtered: rows.length }
|
|
181
|
-
: await pg.queryCache?.(qCount, { table: loadTable?.table || tokenData?.table, time: 5 }).then(el => el?.rows[0] || {});
|
|
181
|
+
: await pg.queryCache?.(qCount, { table: loadTable?.table || tokenData?.table, time: 5 * 60 }).then(el => el?.rows[0] || {});
|
|
182
182
|
|
|
183
|
+
timeArr.push(Date.now())
|
|
183
184
|
const { total, filtered } = counts || {};
|
|
184
185
|
const agg = Object.keys(counts).filter(el => !['total', 'filtered'].includes(el)).reduce((acc, el) => ({ ...acc, [el]: counts[el] }), {});
|
|
185
186
|
|
|
186
187
|
await extraDataGet({ rows, table: loadTable?.table, form }, pg);
|
|
187
188
|
|
|
188
189
|
await metaFormat({ rows, table: tokenData?.table || hookData?.table || params.table }, pg);
|
|
189
|
-
|
|
190
|
+
timeArr.push(Date.now())
|
|
190
191
|
const status = [];
|
|
191
192
|
if (loadTable?.meta?.status) {
|
|
192
193
|
const statusColumn = loadTable.meta?.cls?.[loadTable.meta?.status]
|
|
@@ -273,7 +274,15 @@ export default async function dataAPI(req, reply, called) {
|
|
|
273
274
|
}
|
|
274
275
|
|
|
275
276
|
const res = {
|
|
276
|
-
time:
|
|
277
|
+
time: {
|
|
278
|
+
total: Date.now() - time,
|
|
279
|
+
init: timeArr[1] - timeArr[0],
|
|
280
|
+
filter: timeArr[2] - timeArr[1],
|
|
281
|
+
data: timeArr[3] - timeArr[2],
|
|
282
|
+
count: timeArr[4] - timeArr[3],
|
|
283
|
+
format: timeArr[5] - timeArr[4],
|
|
284
|
+
},
|
|
285
|
+
|
|
277
286
|
public: ispublic,
|
|
278
287
|
tokens,
|
|
279
288
|
card: loadTable?.card,
|
|
@@ -1,42 +1,42 @@
|
|
|
1
|
-
import { applyHook, getTemplate } from '../../../../utils.js';
|
|
2
|
-
|
|
3
|
-
const sql = `select property_key as key, property_json as json, property_int as int,
|
|
4
|
-
property_text as text from admin.properties where 1=1`;
|
|
5
|
-
|
|
6
|
-
async function getSettings({ pg }) {
|
|
7
|
-
const { rows = [] } = await pg.query(sql);
|
|
8
|
-
const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
|
|
9
|
-
return data;
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
export default async function formFunction(req) {
|
|
13
|
-
const time = Date.now();
|
|
14
|
-
|
|
15
|
-
const { pg, params, user } = req;
|
|
16
|
-
const hookData = await applyHook('preForm', { form: params?.form, user });
|
|
17
|
-
|
|
18
|
-
if (hookData?.message && hookData?.status) {
|
|
19
|
-
return { message: hookData?.message, status: hookData?.status };
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
const form = await getTemplate('form', hookData?.form || params?.form);
|
|
23
|
-
if (!form) { return { status: 404, message: 'not found' }; }
|
|
24
|
-
|
|
25
|
-
// replace settings
|
|
26
|
-
const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
|
|
27
|
-
if (arr?.length) {
|
|
28
|
-
const string = JSON.stringify(form);
|
|
29
|
-
const settings = await getSettings({ pg });
|
|
30
|
-
const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
|
|
31
|
-
const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
|
|
32
|
-
return { time: Date.now() - time, form: JSON.parse(res) };
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
const res = { time: Date.now() - time, form };
|
|
36
|
-
const res1 = await applyHook('afterForm', {
|
|
37
|
-
form: hookData?.form || params?.form,
|
|
38
|
-
payload: res,
|
|
39
|
-
user,
|
|
40
|
-
});
|
|
41
|
-
return res1 || { time: Date.now() - time, form };
|
|
42
|
-
}
|
|
1
|
+
import { applyHook, getTemplate } from '../../../../utils.js';
|
|
2
|
+
|
|
3
|
+
const sql = `select property_key as key, property_json as json, property_int as int,
|
|
4
|
+
property_text as text from admin.properties where 1=1`;
|
|
5
|
+
|
|
6
|
+
async function getSettings({ pg }) {
|
|
7
|
+
const { rows = [] } = await pg.query(sql);
|
|
8
|
+
const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
|
|
9
|
+
return data;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export default async function formFunction(req) {
|
|
13
|
+
const time = Date.now();
|
|
14
|
+
|
|
15
|
+
const { pg, params, user } = req;
|
|
16
|
+
const hookData = await applyHook('preForm', { form: params?.form, user });
|
|
17
|
+
|
|
18
|
+
if (hookData?.message && hookData?.status) {
|
|
19
|
+
return { message: hookData?.message, status: hookData?.status };
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const form = await getTemplate('form', hookData?.form || params?.form);
|
|
23
|
+
if (!form) { return { status: 404, message: 'not found' }; }
|
|
24
|
+
|
|
25
|
+
// replace settings
|
|
26
|
+
const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
|
|
27
|
+
if (arr?.length) {
|
|
28
|
+
const string = JSON.stringify(form);
|
|
29
|
+
const settings = await getSettings({ pg });
|
|
30
|
+
const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
|
|
31
|
+
const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
|
|
32
|
+
return { time: Date.now() - time, form: JSON.parse(res) };
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const res = { time: Date.now() - time, form };
|
|
36
|
+
const res1 = await applyHook('afterForm', {
|
|
37
|
+
form: hookData?.form || params?.form,
|
|
38
|
+
payload: res,
|
|
39
|
+
user,
|
|
40
|
+
});
|
|
41
|
+
return res1 || { time: Date.now() - time, form };
|
|
42
|
+
}
|
|
@@ -1,74 +1,74 @@
|
|
|
1
|
-
import {
|
|
2
|
-
getMeta, metaFormat, getTemplates, getTemplate, handlebars,
|
|
3
|
-
} from '../../../../utils.js';
|
|
4
|
-
|
|
5
|
-
function sequence(tables, data, fn) {
|
|
6
|
-
return tables.reduce((promise, table) => promise.then(() => fn({
|
|
7
|
-
...data, tableName: table.replace('.json', ''),
|
|
8
|
-
})), Promise.resolve());
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
async function getData({
|
|
12
|
-
pg, tableName, query = {}, maxLimit, res,
|
|
13
|
-
}) {
|
|
14
|
-
const loadTable = await getTemplate('table', tableName);
|
|
15
|
-
|
|
16
|
-
if (!loadTable) { return { message: 'not found', status: 404 }; }
|
|
17
|
-
|
|
18
|
-
const {
|
|
19
|
-
table, columns, meta,
|
|
20
|
-
} = loadTable;
|
|
21
|
-
|
|
22
|
-
const { pk } = await getMeta(table);
|
|
23
|
-
|
|
24
|
-
const cols = columns.map((el) => el.name || el).join(',');
|
|
25
|
-
const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
|
|
26
|
-
const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
|
|
27
|
-
|
|
28
|
-
const limit = Math.max(maxLimit - res.rows.length, 0);
|
|
29
|
-
// Math.max(query.offset - res.rows.length,0)
|
|
30
|
-
const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
|
|
31
|
-
|
|
32
|
-
const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
|
|
33
|
-
|
|
34
|
-
const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
|
|
35
|
-
const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
|
|
36
|
-
if (query.sql) {
|
|
37
|
-
res.sql.push(q);
|
|
38
|
-
return null;
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
const { rows } = await pg.query(q);
|
|
42
|
-
|
|
43
|
-
const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
|
|
44
|
-
|
|
45
|
-
await metaFormat({ rows, table: tableName });
|
|
46
|
-
res.total += +total;
|
|
47
|
-
rows.forEach((row) => {
|
|
48
|
-
const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
|
|
49
|
-
res.rows.push({
|
|
50
|
-
...row, register: tableName, register_title: loadTable.ua, href,
|
|
51
|
-
});
|
|
52
|
-
});
|
|
53
|
-
return null;
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
export default async function search({
|
|
57
|
-
pg, funcs, query = {},
|
|
58
|
-
}) {
|
|
59
|
-
const time = Date.now();
|
|
60
|
-
|
|
61
|
-
const tables = query.table ? [query.table] : await getTemplates('table');
|
|
62
|
-
const res = { rows: [], sql: [], total: 0 };
|
|
63
|
-
|
|
64
|
-
const maxLimit = Math.min(100, query.limit || '16');
|
|
65
|
-
await sequence(tables, {
|
|
66
|
-
pg, funcs, query, maxLimit, res,
|
|
67
|
-
}, getData);
|
|
68
|
-
|
|
69
|
-
if (query.sql) return res.sql.join(';\n');
|
|
70
|
-
|
|
71
|
-
return {
|
|
72
|
-
time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
|
|
73
|
-
};
|
|
74
|
-
}
|
|
1
|
+
import {
|
|
2
|
+
getMeta, metaFormat, getTemplates, getTemplate, handlebars,
|
|
3
|
+
} from '../../../../utils.js';
|
|
4
|
+
|
|
5
|
+
function sequence(tables, data, fn) {
|
|
6
|
+
return tables.reduce((promise, table) => promise.then(() => fn({
|
|
7
|
+
...data, tableName: table.replace('.json', ''),
|
|
8
|
+
})), Promise.resolve());
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
async function getData({
|
|
12
|
+
pg, tableName, query = {}, maxLimit, res,
|
|
13
|
+
}) {
|
|
14
|
+
const loadTable = await getTemplate('table', tableName);
|
|
15
|
+
|
|
16
|
+
if (!loadTable) { return { message: 'not found', status: 404 }; }
|
|
17
|
+
|
|
18
|
+
const {
|
|
19
|
+
table, columns, meta,
|
|
20
|
+
} = loadTable;
|
|
21
|
+
|
|
22
|
+
const { pk } = await getMeta(table);
|
|
23
|
+
|
|
24
|
+
const cols = columns.map((el) => el.name || el).join(',');
|
|
25
|
+
const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
|
|
26
|
+
const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
|
|
27
|
+
|
|
28
|
+
const limit = Math.max(maxLimit - res.rows.length, 0);
|
|
29
|
+
// Math.max(query.offset - res.rows.length,0)
|
|
30
|
+
const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
|
|
31
|
+
|
|
32
|
+
const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
|
|
33
|
+
|
|
34
|
+
const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
|
|
35
|
+
const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
|
|
36
|
+
if (query.sql) {
|
|
37
|
+
res.sql.push(q);
|
|
38
|
+
return null;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
const { rows } = await pg.query(q);
|
|
42
|
+
|
|
43
|
+
const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
|
|
44
|
+
|
|
45
|
+
await metaFormat({ rows, table: tableName });
|
|
46
|
+
res.total += +total;
|
|
47
|
+
rows.forEach((row) => {
|
|
48
|
+
const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
|
|
49
|
+
res.rows.push({
|
|
50
|
+
...row, register: tableName, register_title: loadTable.ua, href,
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
export default async function search({
|
|
57
|
+
pg, funcs, query = {},
|
|
58
|
+
}) {
|
|
59
|
+
const time = Date.now();
|
|
60
|
+
|
|
61
|
+
const tables = query.table ? [query.table] : await getTemplates('table');
|
|
62
|
+
const res = { rows: [], sql: [], total: 0 };
|
|
63
|
+
|
|
64
|
+
const maxLimit = Math.min(100, query.limit || '16');
|
|
65
|
+
await sequence(tables, {
|
|
66
|
+
pg, funcs, query, maxLimit, res,
|
|
67
|
+
}, getData);
|
|
68
|
+
|
|
69
|
+
if (query.sql) return res.sql.join(';\n');
|
|
70
|
+
|
|
71
|
+
return {
|
|
72
|
+
time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
|
|
73
|
+
};
|
|
74
|
+
}
|