@opengis/fastify-table 1.1.9 → 1.1.11
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/.eslintrc.cjs +42 -42
- package/Changelog.md +305 -305
- package/crud/controllers/deleteCrud.js +22 -22
- package/crud/controllers/insert.js +61 -61
- package/crud/controllers/update.js +62 -62
- package/crud/funcs/dataDelete.js +19 -19
- package/crud/funcs/dataInsert.js +30 -30
- package/crud/funcs/dataUpdate.js +48 -36
- package/crud/funcs/getAccess.js +53 -53
- package/crud/funcs/getOpt.js +10 -10
- package/crud/funcs/setOpt.js +16 -16
- package/crud/funcs/utils/logChanges.js +76 -76
- package/crud/index.js +36 -36
- package/helper.js +28 -28
- package/index.js +97 -97
- package/migration/exec.migrations.js +79 -79
- package/notification/controllers/userNotifications.js +19 -19
- package/notification/funcs/addNotification.js +8 -8
- package/notification/funcs/sendNotification.js +111 -111
- package/package.json +26 -26
- package/pg/funcs/getMeta.js +27 -27
- package/pg/pgClients.js +20 -20
- package/policy/funcs/checkPolicy.js +83 -83
- package/policy/funcs/sqlInjection.js +33 -33
- package/policy/index.js +14 -14
- package/redis/client.js +8 -8
- package/redis/funcs/redisClients.js +2 -2
- package/redis/index.js +19 -19
- package/server/migrations/0.sql +78 -78
- package/server/migrations/properties.sql +30 -30
- package/server/migrations/roles.sql +164 -164
- package/server/migrations/users.sql +89 -89
- package/table/controllers/data.js +103 -103
- package/table/controllers/filter.js +40 -37
- package/table/controllers/search.js +80 -80
- package/table/controllers/suggest.js +79 -79
- package/table/controllers/table.js +52 -52
- package/table/controllers/utils/addTemplateDir.js +8 -8
- package/table/controllers/utils/getSelect.js +19 -19
- package/table/controllers/utils/getSelectMeta.js +66 -66
- package/table/controllers/utils/getTemplate_old.js +28 -28
- package/table/controllers/utils/getTemplates.js +18 -18
- package/table/controllers/utils/gisIRColumn.js +68 -68
- package/table/controllers/utils/loadTemplate.js +1 -1
- package/table/controllers/utils/loadTemplatePath.js +1 -1
- package/table/controllers/utils/userTemplateDir.js +1 -1
- package/table/funcs/getFilterSQL/index.js +79 -79
- package/table/funcs/getFilterSQL/util/formatValue.js +142 -142
- package/table/funcs/getFilterSQL/util/getCustomQuery.js +13 -13
- package/table/funcs/getFilterSQL/util/getFilterQuery.js +73 -73
- package/table/funcs/getFilterSQL/util/getOptimizedQuery.js +12 -12
- package/table/funcs/getFilterSQL/util/getTableSql.js +34 -34
- package/table/funcs/metaFormat/getSelectVal.js +20 -20
- package/table/funcs/metaFormat/index.js +28 -28
- package/table/index.js +84 -84
- package/test/api/crud.test.js +89 -89
- package/test/api/suggest.test.js +66 -66
- package/test/api/table.test.js +89 -89
- package/test/api/widget.test.js +117 -117
- package/test/templates/select/test.storage.data.json +3 -3
- package/test/templates/select/test.suggest.ato_new.json +3 -3
- package/test/templates/select/test.suggest.ato_new.sql +25 -25
- package/test/templates/select/test.suggest.data.json +4 -4
- package/test/templates/select/test.suggest.parent.sql +1 -1
- package/util/controllers/properties.add.js +57 -57
- package/util/controllers/status.monitor.js +8 -8
- package/utils.js +48 -48
- package/widget/controllers/utils/historyFormat.js +76 -76
- package/widget/controllers/utils/obj2db.js +13 -13
- package/widget/controllers/widget.del.js +44 -44
- package/widget/controllers/widget.get.js +98 -98
- package/widget/controllers/widget.set.js +76 -76
- package/widget/index.js +40 -40
|
@@ -1,103 +1,103 @@
|
|
|
1
|
-
import getTemplate from './utils/getTemplate.js';
|
|
2
|
-
import getFilterSQL from '../funcs/getFilterSQL/index.js';
|
|
3
|
-
import getMeta from '../../pg/funcs/getMeta.js';
|
|
4
|
-
import metaFormat from '../funcs/metaFormat/index.js';
|
|
5
|
-
import getAccess from '../../crud/funcs/getAccess.js';
|
|
6
|
-
import setToken from '../../crud/funcs/setToken.js';
|
|
7
|
-
import gisIRColumn from './utils/gisIRColumn.js';
|
|
8
|
-
|
|
9
|
-
const maxLimit = 100;
|
|
10
|
-
export default async function dataAPI({
|
|
11
|
-
pg, params, funcs = {}, query = {}, opt = {}, uid: uid1, req, session,
|
|
12
|
-
}) {
|
|
13
|
-
const time = Date.now();
|
|
14
|
-
|
|
15
|
-
const uid = session?.passport?.user?.uid || uid1 || query.uid || 0;
|
|
16
|
-
|
|
17
|
-
const loadTable = await getTemplate('table', params.table);
|
|
18
|
-
|
|
19
|
-
if (!loadTable) { return { message: 'template not found', status: 404 }; }
|
|
20
|
-
|
|
21
|
-
const {
|
|
22
|
-
table, columns, sql, cardSql, filters, form, meta, sqlColumns, ispublic,
|
|
23
|
-
} = loadTable;
|
|
24
|
-
const { pk, columns: dbColumns = [] } = await getMeta(table);
|
|
25
|
-
|
|
26
|
-
if (!pk) return { message: `table not found: ${table}`, status: 404 };
|
|
27
|
-
|
|
28
|
-
const cols = columns.filter((el) => el.name !== 'geom').map((el) => el.name || el).join(',');
|
|
29
|
-
const metaCols = Object.keys(loadTable?.meta?.cls || {}).filter((el) => !cols.includes(el)).length
|
|
30
|
-
? `,${Object.keys(loadTable?.meta?.cls || {})?.filter((el) => !cols.includes(el)).join(',')}`
|
|
31
|
-
: '';
|
|
32
|
-
const columnList = dbColumns.map((el) => el.name || el).join(',');
|
|
33
|
-
const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
|
|
34
|
-
const cardSqlFiltered = opt?.id || params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
|
|
35
|
-
const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i} on 1=1 `).join('') || '' : '';
|
|
36
|
-
|
|
37
|
-
if (params.id && columnList.includes(params.id)) {
|
|
38
|
-
return gisIRColumn({
|
|
39
|
-
pg, funcs, layer: params.table, column: params.id, sql: query.sql,
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
const fData = query.filter || query.search ? await getFilterSQL({
|
|
44
|
-
filter: query.filter,
|
|
45
|
-
search: query.search,
|
|
46
|
-
table: params.table,
|
|
47
|
-
json: 1,
|
|
48
|
-
}) : {};
|
|
49
|
-
|
|
50
|
-
const keyQuery = query.key && loadTable.key && !(opt?.id || params.id) ? `${loadTable.key}=$1` : null;
|
|
51
|
-
|
|
52
|
-
const limit = Math.min(maxLimit, +(query.limit || 20));
|
|
53
|
-
|
|
54
|
-
const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
|
|
55
|
-
// id, query, filter
|
|
56
|
-
const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
|
|
57
|
-
|
|
58
|
-
const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
|
|
59
|
-
const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
|
|
60
|
-
const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
|
|
61
|
-
const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
|
|
62
|
-
const queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
|
|
63
|
-
const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
|
|
64
|
-
const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
|
|
65
|
-
|
|
66
|
-
const access = await getAccess(req, params.table);
|
|
67
|
-
const where = [(opt?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search, access?.query || '1=1', bbox, queryPolyline].filter((el) => el);
|
|
68
|
-
const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
|
|
69
|
-
const q = `select ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : sqlColumns || cols || '*'} ${metaCols} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
|
|
70
|
-
|
|
71
|
-
if (query.sql === '1') { return q; }
|
|
72
|
-
|
|
73
|
-
const { rows } = await pg.query(q, (opt?.id || params.id ? [opt?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
|
|
74
|
-
|
|
75
|
-
const total = keyQuery || opt?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'}`).then((el) => (el?.rows[0]?.count || 0) - 0);
|
|
76
|
-
|
|
77
|
-
await metaFormat({ rows, table: params.table });
|
|
78
|
-
const res = {
|
|
79
|
-
time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, rows, meta, columns, filters,
|
|
80
|
-
};
|
|
81
|
-
|
|
82
|
-
if (!funcs.config?.security?.disableToken) {
|
|
83
|
-
const addTokens = setToken({
|
|
84
|
-
ids: [JSON.stringify({ add: loadTable.table, form: loadTable.form })],
|
|
85
|
-
mode: 'a',
|
|
86
|
-
uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
|
|
87
|
-
array: 1,
|
|
88
|
-
});
|
|
89
|
-
Object.assign(res, { addToken: addTokens[0] });
|
|
90
|
-
|
|
91
|
-
rows.forEach((row) => {
|
|
92
|
-
const editTokens = setToken({
|
|
93
|
-
ids: [JSON.stringify({ id: row.id, table: loadTable.table, form: loadTable.form })],
|
|
94
|
-
mode: 'w',
|
|
95
|
-
uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
|
|
96
|
-
array: 1,
|
|
97
|
-
});
|
|
98
|
-
Object.assign(row, { token: editTokens[0] });
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
return res;
|
|
103
|
-
}
|
|
1
|
+
import getTemplate from './utils/getTemplate.js';
|
|
2
|
+
import getFilterSQL from '../funcs/getFilterSQL/index.js';
|
|
3
|
+
import getMeta from '../../pg/funcs/getMeta.js';
|
|
4
|
+
import metaFormat from '../funcs/metaFormat/index.js';
|
|
5
|
+
import getAccess from '../../crud/funcs/getAccess.js';
|
|
6
|
+
import setToken from '../../crud/funcs/setToken.js';
|
|
7
|
+
import gisIRColumn from './utils/gisIRColumn.js';
|
|
8
|
+
|
|
9
|
+
const maxLimit = 100;
|
|
10
|
+
export default async function dataAPI({
|
|
11
|
+
pg, params, funcs = {}, query = {}, opt = {}, uid: uid1, req, session,
|
|
12
|
+
}) {
|
|
13
|
+
const time = Date.now();
|
|
14
|
+
|
|
15
|
+
const uid = session?.passport?.user?.uid || uid1 || query.uid || 0;
|
|
16
|
+
|
|
17
|
+
const loadTable = await getTemplate('table', params.table);
|
|
18
|
+
|
|
19
|
+
if (!loadTable) { return { message: 'template not found', status: 404 }; }
|
|
20
|
+
|
|
21
|
+
const {
|
|
22
|
+
table, columns, sql, cardSql, filters, form, meta, sqlColumns, ispublic,
|
|
23
|
+
} = loadTable;
|
|
24
|
+
const { pk, columns: dbColumns = [] } = await getMeta(table);
|
|
25
|
+
|
|
26
|
+
if (!pk) return { message: `table not found: ${table}`, status: 404 };
|
|
27
|
+
|
|
28
|
+
const cols = columns.filter((el) => el.name !== 'geom').map((el) => el.name || el).join(',');
|
|
29
|
+
const metaCols = Object.keys(loadTable?.meta?.cls || {}).filter((el) => !cols.includes(el)).length
|
|
30
|
+
? `,${Object.keys(loadTable?.meta?.cls || {})?.filter((el) => !cols.includes(el)).join(',')}`
|
|
31
|
+
: '';
|
|
32
|
+
const columnList = dbColumns.map((el) => el.name || el).join(',');
|
|
33
|
+
const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
|
|
34
|
+
const cardSqlFiltered = opt?.id || params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
|
|
35
|
+
const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i} on 1=1 `).join('') || '' : '';
|
|
36
|
+
|
|
37
|
+
if (params.id && columnList.includes(params.id)) {
|
|
38
|
+
return gisIRColumn({
|
|
39
|
+
pg, funcs, layer: params.table, column: params.id, sql: query.sql,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
const fData = query.filter || query.search ? await getFilterSQL({
|
|
44
|
+
filter: query.filter,
|
|
45
|
+
search: query.search,
|
|
46
|
+
table: params.table,
|
|
47
|
+
json: 1,
|
|
48
|
+
}) : {};
|
|
49
|
+
|
|
50
|
+
const keyQuery = query.key && loadTable.key && !(opt?.id || params.id) ? `${loadTable.key}=$1` : null;
|
|
51
|
+
|
|
52
|
+
const limit = Math.min(maxLimit, +(query.limit || 20));
|
|
53
|
+
|
|
54
|
+
const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
|
|
55
|
+
// id, query, filter
|
|
56
|
+
const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
|
|
57
|
+
|
|
58
|
+
const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
|
|
59
|
+
const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
|
|
60
|
+
const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
|
|
61
|
+
const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
|
|
62
|
+
const queryBbox = query?.bbox ? query.bbox.replace(/ /g, ',').split(',')?.map((el) => el - 0) : [];
|
|
63
|
+
const queryPolyline = meta?.bbox && query?.polyline ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})` : undefined;
|
|
64
|
+
const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4 ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d ` : undefined;
|
|
65
|
+
|
|
66
|
+
const access = await getAccess(req, params.table);
|
|
67
|
+
const where = [(opt?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search, access?.query || '1=1', bbox, queryPolyline].filter((el) => el);
|
|
68
|
+
const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
|
|
69
|
+
const q = `select ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : sqlColumns || cols || '*'} ${metaCols} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
|
|
70
|
+
|
|
71
|
+
if (query.sql === '1') { return q; }
|
|
72
|
+
|
|
73
|
+
const { rows } = await pg.query(q, (opt?.id || params.id ? [opt?.id || params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
|
|
74
|
+
|
|
75
|
+
const total = keyQuery || opt?.id || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'}`).then((el) => (el?.rows[0]?.count || 0) - 0);
|
|
76
|
+
|
|
77
|
+
await metaFormat({ rows, table: params.table });
|
|
78
|
+
const res = {
|
|
79
|
+
time: Date.now() - time, card: loadTable.card, actions: loadTable.actions, access, total, count: rows.length, pk, form, rows, meta, columns, filters,
|
|
80
|
+
};
|
|
81
|
+
|
|
82
|
+
if (!funcs.config?.security?.disableToken) {
|
|
83
|
+
const addTokens = setToken({
|
|
84
|
+
ids: [JSON.stringify({ add: loadTable.table, form: loadTable.form })],
|
|
85
|
+
mode: 'a',
|
|
86
|
+
uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
|
|
87
|
+
array: 1,
|
|
88
|
+
});
|
|
89
|
+
Object.assign(res, { addToken: addTokens[0] });
|
|
90
|
+
|
|
91
|
+
rows.forEach((row) => {
|
|
92
|
+
const editTokens = setToken({
|
|
93
|
+
ids: [JSON.stringify({ id: row.id, table: loadTable.table, form: loadTable.form })],
|
|
94
|
+
mode: 'w',
|
|
95
|
+
uid: funcs.config?.auth?.disable || ispublic ? '1' : uid,
|
|
96
|
+
array: 1,
|
|
97
|
+
});
|
|
98
|
+
Object.assign(row, { token: editTokens[0] });
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
return res;
|
|
103
|
+
}
|
|
@@ -1,37 +1,40 @@
|
|
|
1
|
-
import getTemplate from './utils/getTemplate.js';
|
|
2
|
-
import getSelect from './utils/getSelect.js';
|
|
3
|
-
import getMeta from '../../pg/funcs/getMeta.js';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
await
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
1
|
+
import getTemplate from './utils/getTemplate.js';
|
|
2
|
+
import getSelect from './utils/getSelect.js';
|
|
3
|
+
import getMeta from '../../pg/funcs/getMeta.js';
|
|
4
|
+
import getFilterSQL from '../funcs/getFilterSQL/index.js';
|
|
5
|
+
|
|
6
|
+
export default async function filter(req) {
|
|
7
|
+
const time = Date.now();
|
|
8
|
+
|
|
9
|
+
const {
|
|
10
|
+
params,
|
|
11
|
+
} = req;
|
|
12
|
+
const loadTable = await getTemplate('table', params.table);
|
|
13
|
+
if (!loadTable) { return { status: 404, message: 'not found' }; }
|
|
14
|
+
const { columns } = await getMeta({ table: loadTable.table });
|
|
15
|
+
|
|
16
|
+
const { optimizedSQL = `select * from ${loadTable.table}` } = loadTable?.sql ? await getFilterSQL({ table: params.table, pg: req.pg }) : {};
|
|
17
|
+
|
|
18
|
+
const filters = loadTable?.filters || loadTable?.filterList || [];
|
|
19
|
+
await Promise.all(filters.filter((el) => el.data).map(async (el) => {
|
|
20
|
+
const cls = await getSelect(el.data);
|
|
21
|
+
if (!cls?.arr || !loadTable.table) return;
|
|
22
|
+
const { dataTypeID } = columns.find((item) => item.name === el.id) || {};
|
|
23
|
+
const countArr = req.pg.pgType[dataTypeID]?.includes('[]')
|
|
24
|
+
? await req.pg.queryCache(`select unnest(${el.id})::text as id,count(*) from (${optimizedSQL})q group by unnest(${el.id})`)
|
|
25
|
+
: await req.pg.queryCache(`select ${el.id}::text as id,count(*) from (${optimizedSQL})q group by ${el.id}`);
|
|
26
|
+
|
|
27
|
+
const options = countArr.rows.map(cel => {
|
|
28
|
+
const data = cls?.arr.find(c => c.id === cel.id);
|
|
29
|
+
return { ...cel, ...data };
|
|
30
|
+
});
|
|
31
|
+
Object.assign(el, { options });
|
|
32
|
+
}));
|
|
33
|
+
return {
|
|
34
|
+
time: Date.now() - time,
|
|
35
|
+
list: filters,
|
|
36
|
+
custom: loadTable?.filterCustom?.map(el => ({ label: el.label })),
|
|
37
|
+
inline: loadTable?.filterInline,
|
|
38
|
+
state: loadTable?.filterState?.map(el => ({ label: el.label })),
|
|
39
|
+
};
|
|
40
|
+
}
|
|
@@ -1,80 +1,80 @@
|
|
|
1
|
-
import getTemplate from './utils/getTemplate.js';
|
|
2
|
-
import getMeta from '../../pg/funcs/getMeta.js';
|
|
3
|
-
import metaFormat from '../funcs/metaFormat/index.js';
|
|
4
|
-
import getTemplates from './utils/getTemplates.js';
|
|
5
|
-
|
|
6
|
-
function sequence(tables, data, fn) {
|
|
7
|
-
return tables.reduce((promise, table) => promise.then(() => fn({
|
|
8
|
-
...data, tableName: table.replace('.json', ''),
|
|
9
|
-
})), Promise.resolve());
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
async function getData({
|
|
13
|
-
pg, funcs, tableName, query = {}, maxLimit, res,
|
|
14
|
-
}) {
|
|
15
|
-
const loadTable = await getTemplate('table', tableName);
|
|
16
|
-
|
|
17
|
-
if (!loadTable) { return { message: 'not found', status: 404 }; }
|
|
18
|
-
|
|
19
|
-
const {
|
|
20
|
-
table, columns, meta,
|
|
21
|
-
} = loadTable;
|
|
22
|
-
|
|
23
|
-
const { pk } = await getMeta(table);
|
|
24
|
-
|
|
25
|
-
const cols = columns.map((el) => el.name || el).join(',');
|
|
26
|
-
const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
|
|
27
|
-
const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
|
|
28
|
-
|
|
29
|
-
const limit = Math.max(maxLimit - res.rows.length, 0);
|
|
30
|
-
// Math.max(query.offset - res.rows.length,0)
|
|
31
|
-
const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
|
|
32
|
-
|
|
33
|
-
const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
|
|
34
|
-
|
|
35
|
-
const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
|
|
36
|
-
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}`;
|
|
37
|
-
if (query.sql) {
|
|
38
|
-
res.sql.push(q);
|
|
39
|
-
return null;
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
const { rows } = await pg.query(q);
|
|
43
|
-
|
|
44
|
-
const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
|
|
45
|
-
|
|
46
|
-
await metaFormat({ rows, table: tableName });
|
|
47
|
-
res.total += +total;
|
|
48
|
-
rows.forEach((row) => {
|
|
49
|
-
const href = meta?.href ? funcs.handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
|
|
50
|
-
res.rows.push({
|
|
51
|
-
...row, register: tableName, register_title: loadTable.ua, href,
|
|
52
|
-
});
|
|
53
|
-
});
|
|
54
|
-
return null;
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
export default async function search({
|
|
58
|
-
pg, funcs, query = {},
|
|
59
|
-
}) {
|
|
60
|
-
const time = Date.now();
|
|
61
|
-
|
|
62
|
-
try {
|
|
63
|
-
const tables = query.table ? [query.table] : await getTemplates('table');
|
|
64
|
-
const res = { rows: [], sql: [], total: 0 };
|
|
65
|
-
|
|
66
|
-
const maxLimit = Math.min(100, query.limit || '16');
|
|
67
|
-
await sequence(tables, {
|
|
68
|
-
pg, funcs, query, maxLimit, res,
|
|
69
|
-
}, getData);
|
|
70
|
-
|
|
71
|
-
if (query.sql) return res.sql.join(';\n');
|
|
72
|
-
|
|
73
|
-
return {
|
|
74
|
-
time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
|
|
75
|
-
};
|
|
76
|
-
}
|
|
77
|
-
catch (err) {
|
|
78
|
-
return { error: err.toString(), status: 500 };
|
|
79
|
-
}
|
|
80
|
-
}
|
|
1
|
+
import getTemplate from './utils/getTemplate.js';
|
|
2
|
+
import getMeta from '../../pg/funcs/getMeta.js';
|
|
3
|
+
import metaFormat from '../funcs/metaFormat/index.js';
|
|
4
|
+
import getTemplates from './utils/getTemplates.js';
|
|
5
|
+
|
|
6
|
+
function sequence(tables, data, fn) {
|
|
7
|
+
return tables.reduce((promise, table) => promise.then(() => fn({
|
|
8
|
+
...data, tableName: table.replace('.json', ''),
|
|
9
|
+
})), Promise.resolve());
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
async function getData({
|
|
13
|
+
pg, funcs, tableName, query = {}, maxLimit, res,
|
|
14
|
+
}) {
|
|
15
|
+
const loadTable = await getTemplate('table', tableName);
|
|
16
|
+
|
|
17
|
+
if (!loadTable) { return { message: 'not found', status: 404 }; }
|
|
18
|
+
|
|
19
|
+
const {
|
|
20
|
+
table, columns, meta,
|
|
21
|
+
} = loadTable;
|
|
22
|
+
|
|
23
|
+
const { pk } = await getMeta(table);
|
|
24
|
+
|
|
25
|
+
const cols = columns.map((el) => el.name || el).join(',');
|
|
26
|
+
const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
|
|
27
|
+
const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
|
|
28
|
+
|
|
29
|
+
const limit = Math.max(maxLimit - res.rows.length, 0);
|
|
30
|
+
// Math.max(query.offset - res.rows.length,0)
|
|
31
|
+
const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
|
|
32
|
+
|
|
33
|
+
const search1 = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
|
|
34
|
+
|
|
35
|
+
const where = [!pk ? 'false' : 'true', loadTable.query, search1].filter((el) => el);
|
|
36
|
+
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}`;
|
|
37
|
+
if (query.sql) {
|
|
38
|
+
res.sql.push(q);
|
|
39
|
+
return null;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
const { rows } = await pg.query(q);
|
|
43
|
+
|
|
44
|
+
const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
|
|
45
|
+
|
|
46
|
+
await metaFormat({ rows, table: tableName });
|
|
47
|
+
res.total += +total;
|
|
48
|
+
rows.forEach((row) => {
|
|
49
|
+
const href = meta?.href ? funcs.handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
|
|
50
|
+
res.rows.push({
|
|
51
|
+
...row, register: tableName, register_title: loadTable.ua, href,
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
return null;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
export default async function search({
|
|
58
|
+
pg, funcs, query = {},
|
|
59
|
+
}) {
|
|
60
|
+
const time = Date.now();
|
|
61
|
+
|
|
62
|
+
try {
|
|
63
|
+
const tables = query.table ? [query.table] : await getTemplates('table');
|
|
64
|
+
const res = { rows: [], sql: [], total: 0 };
|
|
65
|
+
|
|
66
|
+
const maxLimit = Math.min(100, query.limit || '16');
|
|
67
|
+
await sequence(tables, {
|
|
68
|
+
pg, funcs, query, maxLimit, res,
|
|
69
|
+
}, getData);
|
|
70
|
+
|
|
71
|
+
if (query.sql) return res.sql.join(';\n');
|
|
72
|
+
|
|
73
|
+
return {
|
|
74
|
+
time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
catch (err) {
|
|
78
|
+
return { error: err.toString(), status: 500 };
|
|
79
|
+
}
|
|
80
|
+
}
|
|
@@ -1,79 +1,79 @@
|
|
|
1
|
-
import getSelectMeta from './utils/getSelectMeta.js';
|
|
2
|
-
import getPG from '../../pg/funcs/getPG.js';
|
|
3
|
-
import config from '../../config.js';
|
|
4
|
-
import getTemplate from './utils/getTemplate.js';
|
|
5
|
-
// import getTableSql from '../funcs/getFilterSQL/util/getTableSql.js';
|
|
6
|
-
|
|
7
|
-
const limit = 50;
|
|
8
|
-
const headers = { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Methods': 'GET', 'Cache-Control': 'no-cache' };
|
|
9
|
-
|
|
10
|
-
export default async function suggest(req) {
|
|
11
|
-
const { params, query, pg: pg1 } = req;
|
|
12
|
-
|
|
13
|
-
const lang = query.lang || 'ua';
|
|
14
|
-
const time = Date.now();
|
|
15
|
-
const parent = query.parent || '';
|
|
16
|
-
|
|
17
|
-
const [table, column] = params.data?.includes(':') ? params.data.split(':') : [];
|
|
18
|
-
const selectName = query.sel || query.name || params.data;
|
|
19
|
-
if (!selectName) return { headers, status: 400, message: 'name is required' };
|
|
20
|
-
|
|
21
|
-
const body = await getTemplate('table', table);
|
|
22
|
-
if (table && !pg1.pk[body?.table || table]) {
|
|
23
|
-
return { headers, status: 400, message: 'param name is invalid: 1' };
|
|
24
|
-
}
|
|
25
|
-
const columnExists = body?.columns?.find((col) => col?.name === column);
|
|
26
|
-
if (table && (!column || !columnExists)) {
|
|
27
|
-
return { headers, status: 400, message: 'param name is invalid: 2' };
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
const meta = table && column
|
|
31
|
-
? {
|
|
32
|
-
original: `with c(id,text) as (select row_number() over(), ${column} from ${body?.table || table} group by ${column} ) select * from c`,
|
|
33
|
-
searchQuery: '("text" ilike $1 )',
|
|
34
|
-
}
|
|
35
|
-
: await getSelectMeta({ name: selectName, nocache: query?.nocache });
|
|
36
|
-
const pg = meta?.db ? getPG(meta.db) : pg1;
|
|
37
|
-
if (!meta) return { headers, status: 404, message: 'Not found query select ' };
|
|
38
|
-
if (query.meta) return meta;
|
|
39
|
-
|
|
40
|
-
const { arr, searchQuery } = meta;
|
|
41
|
-
|
|
42
|
-
if (arr) {
|
|
43
|
-
const lower = query.key?.toLowerCase();
|
|
44
|
-
const data = query.key || query.val
|
|
45
|
-
? arr?.filter((el) => !lower || (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1)?.filter((el) => !query.val || el.id === query.val)
|
|
46
|
-
: arr;
|
|
47
|
-
return {
|
|
48
|
-
limit, count: data.length, mode: 'array', time: Date.now() - time, data,
|
|
49
|
-
};
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
// search
|
|
53
|
-
const search = query.key ? searchQuery : null;
|
|
54
|
-
|
|
55
|
-
// val
|
|
56
|
-
// const pk = meta.originalCols.split(',')[0];
|
|
57
|
-
const val = query.val ? ` id=any('{${query.val.replace(/'/g, "''")}}')` : '';
|
|
58
|
-
|
|
59
|
-
const sqlSuggest = `${meta.original.replace(/{{parent}}/gi, parent)} where ${[search, val, 'id is not null'].filter((el) => el).join(' and ') || 'true'} limit ${limit}`;
|
|
60
|
-
if (query.sql) return sqlSuggest;
|
|
61
|
-
|
|
62
|
-
// query
|
|
63
|
-
const { rows: dataNew } = meta.searchColumn ? { rows: [] } : await pg.query(sqlSuggest, query.key ? [`${query.key}%`] : []);
|
|
64
|
-
const { rows: dataNew1 } = dataNew.length < limit ? await pg.query(sqlSuggest, query.key ? [`%${query.key}%`] : []) : {};
|
|
65
|
-
const ids = dataNew.map((el) => el.id);
|
|
66
|
-
const data = dataNew.concat((dataNew1 || []).filter((el) => !ids?.includes(el.id)));
|
|
67
|
-
|
|
68
|
-
const message = {
|
|
69
|
-
time: Date.now() - time,
|
|
70
|
-
count: data.length,
|
|
71
|
-
total: meta.count - 0,
|
|
72
|
-
mode: 'sql',
|
|
73
|
-
db: meta.db,
|
|
74
|
-
sql: config.local ? sqlSuggest : undefined,
|
|
75
|
-
data,
|
|
76
|
-
};
|
|
77
|
-
|
|
78
|
-
return message;
|
|
79
|
-
}
|
|
1
|
+
import getSelectMeta from './utils/getSelectMeta.js';
|
|
2
|
+
import getPG from '../../pg/funcs/getPG.js';
|
|
3
|
+
import config from '../../config.js';
|
|
4
|
+
import getTemplate from './utils/getTemplate.js';
|
|
5
|
+
// import getTableSql from '../funcs/getFilterSQL/util/getTableSql.js';
|
|
6
|
+
|
|
7
|
+
const limit = 50;
|
|
8
|
+
const headers = { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Methods': 'GET', 'Cache-Control': 'no-cache' };
|
|
9
|
+
|
|
10
|
+
export default async function suggest(req) {
|
|
11
|
+
const { params, query, pg: pg1 } = req;
|
|
12
|
+
|
|
13
|
+
const lang = query.lang || 'ua';
|
|
14
|
+
const time = Date.now();
|
|
15
|
+
const parent = query.parent || '';
|
|
16
|
+
|
|
17
|
+
const [table, column] = params.data?.includes(':') ? params.data.split(':') : [];
|
|
18
|
+
const selectName = query.sel || query.name || params.data;
|
|
19
|
+
if (!selectName) return { headers, status: 400, message: 'name is required' };
|
|
20
|
+
|
|
21
|
+
const body = await getTemplate('table', table);
|
|
22
|
+
if (table && !pg1.pk[body?.table || table]) {
|
|
23
|
+
return { headers, status: 400, message: 'param name is invalid: 1' };
|
|
24
|
+
}
|
|
25
|
+
const columnExists = body?.columns?.find((col) => col?.name === column);
|
|
26
|
+
if (table && (!column || !columnExists)) {
|
|
27
|
+
return { headers, status: 400, message: 'param name is invalid: 2' };
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
const meta = table && column
|
|
31
|
+
? {
|
|
32
|
+
original: `with c(id,text) as (select row_number() over(), ${column} from ${body?.table || table} group by ${column} ) select * from c`,
|
|
33
|
+
searchQuery: '("text" ilike $1 )',
|
|
34
|
+
}
|
|
35
|
+
: await getSelectMeta({ name: selectName, nocache: query?.nocache });
|
|
36
|
+
const pg = meta?.db ? getPG(meta.db) : pg1;
|
|
37
|
+
if (!meta) return { headers, status: 404, message: 'Not found query select ' };
|
|
38
|
+
if (query.meta) return meta;
|
|
39
|
+
|
|
40
|
+
const { arr, searchQuery } = meta;
|
|
41
|
+
|
|
42
|
+
if (arr) {
|
|
43
|
+
const lower = query.key?.toLowerCase();
|
|
44
|
+
const data = query.key || query.val
|
|
45
|
+
? arr?.filter((el) => !lower || (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1)?.filter((el) => !query.val || el.id === query.val)
|
|
46
|
+
: arr;
|
|
47
|
+
return {
|
|
48
|
+
limit, count: data.length, mode: 'array', time: Date.now() - time, data,
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
// search
|
|
53
|
+
const search = query.key ? searchQuery : null;
|
|
54
|
+
|
|
55
|
+
// val
|
|
56
|
+
// const pk = meta.originalCols.split(',')[0];
|
|
57
|
+
const val = query.val ? ` id=any('{${query.val.replace(/'/g, "''")}}')` : '';
|
|
58
|
+
|
|
59
|
+
const sqlSuggest = `${meta.original.replace(/{{parent}}/gi, parent)} where ${[search, val, 'id is not null'].filter((el) => el).join(' and ') || 'true'} limit ${limit}`;
|
|
60
|
+
if (query.sql) return sqlSuggest;
|
|
61
|
+
|
|
62
|
+
// query
|
|
63
|
+
const { rows: dataNew } = meta.searchColumn ? { rows: [] } : await pg.query(sqlSuggest, query.key ? [`${query.key}%`] : []);
|
|
64
|
+
const { rows: dataNew1 } = dataNew.length < limit ? await pg.query(sqlSuggest, query.key ? [`%${query.key}%`] : []) : {};
|
|
65
|
+
const ids = dataNew.map((el) => el.id);
|
|
66
|
+
const data = dataNew.concat((dataNew1 || []).filter((el) => !ids?.includes(el.id)));
|
|
67
|
+
|
|
68
|
+
const message = {
|
|
69
|
+
time: Date.now() - time,
|
|
70
|
+
count: data.length,
|
|
71
|
+
total: meta.count - 0,
|
|
72
|
+
mode: 'sql',
|
|
73
|
+
db: meta.db,
|
|
74
|
+
sql: config.local ? sqlSuggest : undefined,
|
|
75
|
+
data,
|
|
76
|
+
};
|
|
77
|
+
|
|
78
|
+
return message;
|
|
79
|
+
}
|