@saltcorn/data 0.9.4-beta.9 → 0.9.4
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/dist/base-plugin/actions.d.ts +124 -58
- package/dist/base-plugin/actions.d.ts.map +1 -1
- package/dist/base-plugin/actions.js +94 -19
- package/dist/base-plugin/actions.js.map +1 -1
- package/dist/base-plugin/fieldviews.d.ts.map +1 -1
- package/dist/base-plugin/fieldviews.js +9 -1
- package/dist/base-plugin/fieldviews.js.map +1 -1
- package/dist/base-plugin/fileviews.d.ts +13 -0
- package/dist/base-plugin/fileviews.js +42 -2
- package/dist/base-plugin/fileviews.js.map +1 -1
- package/dist/base-plugin/index.d.ts +187 -183
- package/dist/base-plugin/index.d.ts.map +1 -1
- package/dist/base-plugin/types.d.ts.map +1 -1
- package/dist/base-plugin/types.js +19 -10
- package/dist/base-plugin/types.js.map +1 -1
- package/dist/base-plugin/viewtemplates/edit.d.ts +4 -1
- package/dist/base-plugin/viewtemplates/edit.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/edit.js +109 -33
- package/dist/base-plugin/viewtemplates/edit.js.map +1 -1
- package/dist/base-plugin/viewtemplates/feed.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/feed.js +4 -1
- package/dist/base-plugin/viewtemplates/feed.js.map +1 -1
- package/dist/base-plugin/viewtemplates/filter.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/filter.js +66 -5
- package/dist/base-plugin/viewtemplates/filter.js.map +1 -1
- package/dist/base-plugin/viewtemplates/list.d.ts +3 -2
- package/dist/base-plugin/viewtemplates/list.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/list.js +274 -38
- package/dist/base-plugin/viewtemplates/list.js.map +1 -1
- package/dist/base-plugin/viewtemplates/show.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/show.js +80 -26
- package/dist/base-plugin/viewtemplates/show.js.map +1 -1
- package/dist/base-plugin/viewtemplates/viewable_fields.d.ts +2 -1
- package/dist/base-plugin/viewtemplates/viewable_fields.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/viewable_fields.js +147 -23
- package/dist/base-plugin/viewtemplates/viewable_fields.js.map +1 -1
- package/dist/db/connect.d.ts.map +1 -1
- package/dist/db/connect.js +20 -0
- package/dist/db/connect.js.map +1 -1
- package/dist/db/fixtures.d.ts.map +1 -1
- package/dist/db/fixtures.js +47 -0
- package/dist/db/fixtures.js.map +1 -1
- package/dist/db/state.d.ts +5 -0
- package/dist/db/state.d.ts.map +1 -1
- package/dist/db/state.js +18 -0
- package/dist/db/state.js.map +1 -1
- package/dist/migrations/202402071125.d.ts +2 -0
- package/dist/migrations/202402071125.d.ts.map +1 -0
- package/dist/migrations/202402071125.js +4 -0
- package/dist/migrations/202402071125.js.map +1 -0
- package/dist/models/config.d.ts.map +1 -1
- package/dist/models/config.js +27 -0
- package/dist/models/config.js.map +1 -1
- package/dist/models/email.d.ts.map +1 -1
- package/dist/models/email.js +6 -2
- package/dist/models/email.js.map +1 -1
- package/dist/models/field.d.ts.map +1 -1
- package/dist/models/field.js +2 -2
- package/dist/models/field.js.map +1 -1
- package/dist/models/file.d.ts +2 -0
- package/dist/models/file.d.ts.map +1 -1
- package/dist/models/file.js +9 -0
- package/dist/models/file.js.map +1 -1
- package/dist/models/internal/query.d.ts +6 -0
- package/dist/models/internal/query.d.ts.map +1 -0
- package/dist/models/internal/query.js +86 -0
- package/dist/models/internal/query.js.map +1 -0
- package/dist/models/page.d.ts.map +1 -1
- package/dist/models/page.js +4 -0
- package/dist/models/page.js.map +1 -1
- package/dist/models/page_group.d.ts +1 -0
- package/dist/models/page_group.d.ts.map +1 -1
- package/dist/models/page_group.js +1 -0
- package/dist/models/page_group.js.map +1 -1
- package/dist/models/table.d.ts +18 -4
- package/dist/models/table.d.ts.map +1 -1
- package/dist/models/table.js +84 -52
- package/dist/models/table.js.map +1 -1
- package/dist/models/tag_entry.d.ts.map +1 -1
- package/dist/models/tag_entry.js +9 -0
- package/dist/models/tag_entry.js.map +1 -1
- package/dist/models/trigger.d.ts +3 -3
- package/dist/models/trigger.d.ts.map +1 -1
- package/dist/models/trigger.js +69 -7
- package/dist/models/trigger.js.map +1 -1
- package/dist/models/user.d.ts.map +1 -1
- package/dist/models/user.js +5 -4
- package/dist/models/user.js.map +1 -1
- package/dist/models/view.d.ts +1 -0
- package/dist/models/view.d.ts.map +1 -1
- package/dist/models/view.js +6 -0
- package/dist/models/view.js.map +1 -1
- package/dist/plugin-helper.d.ts.map +1 -1
- package/dist/plugin-helper.js +56 -17
- package/dist/plugin-helper.js.map +1 -1
- package/dist/tests/actions.test.js +143 -2
- package/dist/tests/actions.test.js.map +1 -1
- package/dist/tests/auth.test.js +101 -1
- package/dist/tests/auth.test.js.map +1 -1
- package/dist/tests/calc.test.js +20 -0
- package/dist/tests/calc.test.js.map +1 -1
- package/dist/tests/edit.test.js +558 -0
- package/dist/tests/edit.test.js.map +1 -1
- package/dist/tests/filter.test.d.ts +2 -0
- package/dist/tests/filter.test.d.ts.map +1 -0
- package/dist/tests/filter.test.js +438 -0
- package/dist/tests/filter.test.js.map +1 -0
- package/dist/tests/list.test.d.ts +2 -0
- package/dist/tests/list.test.d.ts.map +1 -0
- package/dist/tests/list.test.js +903 -0
- package/dist/tests/list.test.js.map +1 -0
- package/dist/tests/show.test.d.ts +2 -0
- package/dist/tests/show.test.d.ts.map +1 -0
- package/dist/tests/show.test.js +325 -0
- package/dist/tests/show.test.js.map +1 -0
- package/dist/tests/table.test.js +213 -56
- package/dist/tests/table.test.js.map +1 -1
- package/dist/tests/table_history.test.js +51 -0
- package/dist/tests/table_history.test.js.map +1 -1
- package/dist/tests/tag.test.js +1 -1
- package/dist/tests/tag.test.js.map +1 -1
- package/dist/tests/view.test.js +15 -1
- package/dist/tests/view.test.js.map +1 -1
- package/dist/utils.d.ts +2 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +19 -0
- package/dist/utils.js.map +1 -1
- package/package.json +8 -8
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.process_aggregations = exports.getAggAndField = void 0;
|
|
7
|
+
const internal_1 = require("@saltcorn/db-common/internal");
|
|
8
|
+
const utils_1 = __importDefault(require("../../utils"));
|
|
9
|
+
const { isNode } = utils_1.default;
|
|
10
|
+
const db_1 = __importDefault(require("../../db"));
|
|
11
|
+
// TODO check valueFormula for sql injection
|
|
12
|
+
const getAggAndField = (aggregate, field, valueFormula) => aggregate.toLowerCase() === "countunique"
|
|
13
|
+
? `count(distinct ${field ? `"${(0, internal_1.sqlsanitize)(field)}"` : "*"})`
|
|
14
|
+
: `${(0, internal_1.sqlsanitize)(aggregate)}(${field ? `"${(0, internal_1.sqlsanitize)(field)}"` : valueFormula || "*"})`;
|
|
15
|
+
exports.getAggAndField = getAggAndField;
|
|
16
|
+
const process_aggregations = (this_table, //Table
|
|
17
|
+
aggregations, fldNms, values, schema) => {
|
|
18
|
+
let placeCounter = values.length;
|
|
19
|
+
let aggValues = []; // for sqlite
|
|
20
|
+
let Table = this_table.constructor;
|
|
21
|
+
Object.entries(aggregations).forEach(([fldnm, { table, ref, field, valueFormula, where, aggregate, subselect, through },]) => {
|
|
22
|
+
let whereStr = "";
|
|
23
|
+
if (where && !subselect) {
|
|
24
|
+
const whereAndValues = (0, internal_1.mkWhere)(where, db_1.default.isSQLite, placeCounter);
|
|
25
|
+
// todo warning deprecated symbol substr is used
|
|
26
|
+
whereStr = whereAndValues.where.substr(6); // remove "where "
|
|
27
|
+
if (isNode())
|
|
28
|
+
values.push(...whereAndValues.values);
|
|
29
|
+
else
|
|
30
|
+
aggValues.push(...whereAndValues.values);
|
|
31
|
+
placeCounter += whereAndValues.values.length;
|
|
32
|
+
}
|
|
33
|
+
const aggTable = Table.findOne({ name: table });
|
|
34
|
+
const aggField = aggTable?.fields?.find((f) => f.name === field);
|
|
35
|
+
const ownField = through ? (0, internal_1.sqlsanitize)(through) : this_table.pk_name;
|
|
36
|
+
const agg_and_field = (0, exports.getAggAndField)(aggregate, field, valueFormula);
|
|
37
|
+
if (aggField?.is_fkey &&
|
|
38
|
+
aggField.attributes.summary_field &&
|
|
39
|
+
aggregate.toLowerCase() === "array_agg" &&
|
|
40
|
+
field) {
|
|
41
|
+
let whereClause = ref
|
|
42
|
+
? `aggto."${(0, internal_1.sqlsanitize)(ref)}"=a."${ownField}"`
|
|
43
|
+
: "";
|
|
44
|
+
if (whereStr)
|
|
45
|
+
whereClause += (whereClause ? ` and ` : "") + whereStr;
|
|
46
|
+
if (whereClause)
|
|
47
|
+
whereClause = ` where ` + whereClause;
|
|
48
|
+
const newFld = `(select array_agg(aggjoin."${(0, internal_1.sqlsanitize)(aggField.attributes.summary_field)}") from ${schema}"${(0, internal_1.sqlsanitize)(table)}" aggto join ${schema}"${(0, internal_1.sqlsanitize)(aggField.reftable_name)}" aggjoin on aggto."${(0, internal_1.sqlsanitize)(field)}" = aggjoin.id ${whereClause}) ${(0, internal_1.sqlsanitize)(fldnm)}`;
|
|
49
|
+
fldNms.push(newFld);
|
|
50
|
+
}
|
|
51
|
+
else if (field && aggregate.startsWith("Percent ")) {
|
|
52
|
+
const targetBoolVal = aggregate.split(" ")[1] === "true";
|
|
53
|
+
let whereClause = ref ? `"${(0, internal_1.sqlsanitize)(ref)}"=a."${ownField}"` : "";
|
|
54
|
+
if (whereStr)
|
|
55
|
+
whereClause += (whereClause ? ` and ` : "") + whereStr;
|
|
56
|
+
if (whereClause)
|
|
57
|
+
whereClause = ` where ` + whereClause;
|
|
58
|
+
fldNms.push(`(select avg( CASE WHEN "${(0, internal_1.sqlsanitize)(field)}"=${JSON.stringify(!!targetBoolVal)} THEN 100.0 ELSE 0.0 END) from ${schema}"${(0, internal_1.sqlsanitize)(table)}" ${whereClause}) ${(0, internal_1.sqlsanitize)(fldnm)}`);
|
|
59
|
+
}
|
|
60
|
+
else if (field &&
|
|
61
|
+
(aggregate.startsWith("Latest ") || aggregate.startsWith("Earliest "))) {
|
|
62
|
+
const dateField = aggregate.split(" ")[1];
|
|
63
|
+
const isLatest = aggregate.startsWith("Latest ");
|
|
64
|
+
let whereClause = ref ? `"${(0, internal_1.sqlsanitize)(ref)}"=a."${ownField}"` : "";
|
|
65
|
+
if (whereStr)
|
|
66
|
+
whereClause += (whereClause ? ` and ` : "") + whereStr;
|
|
67
|
+
if (whereClause)
|
|
68
|
+
whereClause = ` where ` + whereClause;
|
|
69
|
+
fldNms.push(`(select "${(0, internal_1.sqlsanitize)(field)}" from ${schema}"${(0, internal_1.sqlsanitize)(table)}" where "${dateField}"=(select ${isLatest ? `max` : `min`}("${dateField}") from ${schema}"${(0, internal_1.sqlsanitize)(table)}" ${whereClause}) limit 1) ${(0, internal_1.sqlsanitize)(fldnm)}`);
|
|
70
|
+
}
|
|
71
|
+
else if (subselect && ref)
|
|
72
|
+
fldNms.push(`(select ${agg_and_field} from ${schema}"${(0, internal_1.sqlsanitize)(table)}" where "${(0, internal_1.sqlsanitize)(ref)}" in (select "${subselect.field}" from ${schema}"${(0, internal_1.sqlsanitize)(subselect.table.name)}" where "${subselect.whereField}"=a."${ownField}")) ${(0, internal_1.sqlsanitize)(fldnm)}`);
|
|
73
|
+
else {
|
|
74
|
+
let whereClause = ref ? `"${(0, internal_1.sqlsanitize)(ref)}"=a."${ownField}"` : "";
|
|
75
|
+
if (whereStr)
|
|
76
|
+
whereClause += (whereClause ? ` and ` : "") + whereStr;
|
|
77
|
+
if (whereClause)
|
|
78
|
+
whereClause = ` where ` + whereClause;
|
|
79
|
+
fldNms.push(`(select ${agg_and_field} from ${schema}"${(0, internal_1.sqlsanitize)(table)}" ${whereClause}) ${(0, internal_1.sqlsanitize)(fldnm)}`);
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
if (!isNode())
|
|
83
|
+
values.unshift(...aggValues);
|
|
84
|
+
};
|
|
85
|
+
exports.process_aggregations = process_aggregations;
|
|
86
|
+
//# sourceMappingURL=query.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../models/internal/query.ts"],"names":[],"mappings":";;;;;;AAQA,2DAKsC;AACtC,wDAAgC;AAChC,MAAM,EAAE,MAAM,EAAE,GAAG,eAAK,CAAC;AAEzB,kDAA0B;AAE1B,4CAA4C;AACrC,MAAM,cAAc,GAAG,CAC5B,SAAiB,EACjB,KAAyB,EACzB,YAAgC,EAChC,EAAE,CACF,SAAS,CAAC,WAAW,EAAE,KAAK,aAAa;IACvC,CAAC,CAAC,kBAAkB,KAAK,CAAC,CAAC,CAAC,IAAI,IAAA,sBAAW,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG;IAC9D,CAAC,CAAC,GAAG,IAAA,sBAAW,EAAC,SAAS,CAAC,IACvB,KAAK,CAAC,CAAC,CAAC,IAAI,IAAA,sBAAW,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,IAAI,GACtD,GAAG,CAAC;AATG,QAAA,cAAc,kBASjB;AAEH,MAAM,oBAAoB,GAAG,CAClC,UAAe,EAAE,OAAO;AACxB,YAAkD,EAClD,MAAgB,EAChB,MAAa,EACb,MAAc,EACd,EAAE;IACF,IAAI,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;IAEjC,IAAI,SAAS,GAAQ,EAAE,CAAC,CAAC,aAAa;IACtC,IAAI,KAAK,GAAG,UAAU,CAAC,WAAW,CAAC;IAEnC,MAAM,CAAC,OAAO,CAAqB,YAAY,CAAC,CAAC,OAAO,CACtD,CAAC,CACC,KAAK,EACL,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,EAC1E,EAAE,EAAE;QACH,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,IAAI,KAAK,IAAI,CAAC,SAAS,EAAE;YACvB,MAAM,cAAc,GAAG,IAAA,kBAAO,EAAC,KAAK,EAAE,YAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YACjE,gDAAgD;YAChD,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB;YAC7D,IAAI,MAAM,EAAE;gBAAE,MAAM,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;;gBAC/C,SAAS,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;YAC9C,YAAY,IAAI,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC;SAC9C;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;QACxE,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,sBAAW,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;QACrE,MAAM,aAAa,GAAG,IAAA,sBAAc,EAAC,SAAS,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;QAErE,IACE,QAAQ,EAAE,OAAO;YACjB,QAAQ,CAAC,UAAU,CAAC,aAAa;YACjC,SAAS,CAAC,WAAW,EAAE,KAAK,WAAW;YACvC,KAAK,EACL;YACA,IAAI,WAAW,GAAG,GAAG;gBACnB,CAAC,CAAC,UAAU,IAAA,sBAAW,EAAC,GAAG,CAAC,QAAQ,QAAQ,GAAG;gBAC/C,CAAC,CAAC,EAAE,CAAC;YACP,IAAI,QAAQ;gBAAE,WAAW,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC;YACrE,IAAI,WAAW;gBAAE,WAAW,GAAG,SAAS,GAAG,WAAW,CAAC;YACvD,MAAM,MAAM,GAAG,8BAA8B,IAAA,sBAAW,EACtD,QAAQ,CAAC,UAAU,CAAC,aAAa,CAClC,WAAW,MAAM,IAAI,IAAA,sBAAW,EAC/B,KAAK,CACN,gBAAgB,MAAM,IAAI,IAAA,sBAAW,EACpC,QAAQ,CAAC,aAAuB,CACjC,uBAAuB,IAAA,sBAAW,EACjC,KAAK,CACN,kBAAkB,WAAW,KAAK,IAAA,sBAAW,EAAC,KAAK,CAAC,EAAE,CAAC;YAExD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrB;aAAM,IAAI,KAAK,IAAI,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACpD,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC;YACzD,IAAI,WAAW,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,IAAA,sBAAW,EAAC,GAAG,CAAC,QAAQ,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACrE,IAAI,QAAQ;gBAAE,WAAW,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC;YACrE,IAAI,WAAW;gBAAE,WAAW,GAAG,SAAS,GAAG,WAAW,CAAC;YACvD,MAAM,CAAC,IAAI,CACT,2BAA2B,IAAA,sBAAW,EAAC,KAAK,CAAC,KAAK,IAAI,CAAC,SAAS,CAC9D,CAAC,CAAC,aAAa,CAChB,mCAAmC,MAAM,IAAI,IAAA,sBAAW,EACvD,KAAK,CACN,KAAK,WAAW,KAAK,IAAA,sBAAW,EAAC,KAAK,CAAC,EAAE,CAC3C,CAAC;SACH;aAAM,IACL,KAAK;YACL,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EACtE;YACA,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YACjD,IAAI,WAAW,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,IAAA,sBAAW,EAAC,GAAG,CAAC,QAAQ,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACrE,IAAI,QAAQ;gBAAE,WAAW,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC;YACrE,IAAI,WAAW;gBAAE,WAAW,GAAG,SAAS,GAAG,WAAW,CAAC;YACvD,MAAM,CAAC,IAAI,CACT,YAAY,IAAA,sBAAW,EAAC,KAAK,CAAC,UAAU,MAAM,IAAI,IAAA,sBAAW,EAC3D,KAAK,CACN,YAAY,SAAS,aACpB,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KACrB,KAAK,SAAS,WAAW,MAAM,IAAI,IAAA,sBAAW,EAC5C,KAAK,CACN,KAAK,WAAW,cAAc,IAAA,sBAAW,EAAC,KAAK,CAAC,EAAE,CACpD,CAAC;SACH;aAAM,IAAI,SAAS,IAAI,GAAG;YACzB,MAAM,CAAC,IAAI,CACT,WAAW,aAAa,SAAS,MAAM,IAAI,IAAA,sBAAW,EACpD,KAAK,CACN,YAAY,IAAA,sBAAW,EAAC,GAAG,CAAC,iBAC3B,SAAS,CAAC,KACZ,UAAU,MAAM,IAAI,IAAA,sBAAW,EAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,YACnD,SAAS,CAAC,UACZ,QAAQ,QAAQ,OAAO,IAAA,sBAAW,EAAC,KAAK,CAAC,EAAE,CAC5C,CAAC;aACC;YACH,IAAI,WAAW,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,IAAA,sBAAW,EAAC,GAAG,CAAC,QAAQ,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACrE,IAAI,QAAQ;gBAAE,WAAW,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC;YACrE,IAAI,WAAW;gBAAE,WAAW,GAAG,SAAS,GAAG,WAAW,CAAC;YACvD,MAAM,CAAC,IAAI,CACT,WAAW,aAAa,SAAS,MAAM,IAAI,IAAA,sBAAW,EACpD,KAAK,CACN,KAAK,WAAW,KAAK,IAAA,sBAAW,EAAC,KAAK,CAAC,EAAE,CAC3C,CAAC;SACH;IACH,CAAC,CACF,CAAC;IAEF,IAAI,CAAC,MAAM,EAAE;QAAE,MAAM,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC;AAC9C,CAAC,CAAC;AA3GW,QAAA,oBAAoB,wBA2G/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../models/page.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EACV,MAAM,EACN,QAAQ,EACR,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,KAAK,EACV,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,+CAA+C,CAAC;AAyBvD,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAE3E;;;GAGG;AACH,cAAM,IAAK,YAAW,YAAY;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB;;OAEG;gBACS,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI;IAgBxC;;;;;OAKG;WACU,IAAI,CACf,KAAK,CAAC,EAAE,KAAK,EACb,UAAU,GAAE,aAAiD,GAC5D,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAWvB;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,GAAG,IAAI;IAkBzC;;;;;OAKG;WACU,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxD,iBAAiB;IAGjB;;;;OAIG;WACU,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzD;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../models/page.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EACV,MAAM,EACN,QAAQ,EACR,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,KAAK,EACV,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,+CAA+C,CAAC;AAyBvD,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAE3E;;;GAGG;AACH,cAAM,IAAK,YAAW,YAAY;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB;;OAEG;gBACS,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI;IAgBxC;;;;;OAKG;WACU,IAAI,CACf,KAAK,CAAC,EAAE,KAAK,EACb,UAAU,GAAE,aAAiD,GAC5D,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAWvB;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,GAAG,IAAI;IAkBzC;;;;;OAKG;WACU,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxD,iBAAiB;IAGjB;;;;OAIG;WACU,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzD;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;OAGG;IACG,sBAAsB,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYtD;;;OAGG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAKnC;IAED;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB5B;;;;;OAKG;IACG,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAgLhE,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAGlC;IAED,iBAAiB,IAAI,gBAAgB;IAI/B,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;CAI7C;AAED,SAAS,IAAI,CAAC"}
|
package/dist/models/page.js
CHANGED
|
@@ -140,6 +140,7 @@ class Page {
|
|
|
140
140
|
*/
|
|
141
141
|
async delete() {
|
|
142
142
|
// delete tag entries from _sc_tag_entries
|
|
143
|
+
await db_1.default.deleteWhere("_sc_page_group_members", { page_id: this.id });
|
|
143
144
|
await db_1.default.deleteWhere("_sc_tag_entries", { page_id: this.id });
|
|
144
145
|
await db_1.default.deleteWhere("_sc_pages", { id: this.id });
|
|
145
146
|
const root_page_for_roles = await this.is_root_page_for_roles();
|
|
@@ -263,6 +264,9 @@ class Page {
|
|
|
263
264
|
? `page "${segment.page}" not found`
|
|
264
265
|
: "no page specified"));
|
|
265
266
|
}
|
|
267
|
+
else if (page.name === this.name) {
|
|
268
|
+
throw new InvalidConfiguration(`Page ${this.name} configuration error in embedded page: Infinite loop page-in-page`);
|
|
269
|
+
}
|
|
266
270
|
else {
|
|
267
271
|
const role = (extraArgs.req.user || {}).role_id || 100;
|
|
268
272
|
const pageContent = await page.run(querystate, extraArgs);
|
package/dist/models/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../models/page.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../models/page.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ declare class PageGroup implements AbstractPageGroup {
|
|
|
16
16
|
description?: string;
|
|
17
17
|
members: Array<AbstractPageGroupMember>;
|
|
18
18
|
min_role: number;
|
|
19
|
+
random_allocation: boolean;
|
|
19
20
|
constructor(cfg: PageGroupCfg);
|
|
20
21
|
/**
|
|
21
22
|
* determine the first page in the group that matches the client screen size
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page_group.d.ts","sourceRoot":"","sources":["../../models/page_group.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EACjB,YAAY,EACb,MAAM,qDAAqD,CAAC;AAC7D,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,EACV,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,4DAA4D,CAAC;AAGpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,eAAe,MAAM,qBAAqB,CAAC;AAIlD;;;;;GAKG;AACH,cAAM,SAAU,YAAW,iBAAiB;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"page_group.d.ts","sourceRoot":"","sources":["../../models/page_group.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EACjB,YAAY,EACb,MAAM,qDAAqD,CAAC;AAC7D,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,EACV,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,4DAA4D,CAAC;AAGpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,eAAe,MAAM,qBAAqB,CAAC;AAIlD;;;;;GAKG;AACH,cAAM,SAAU,YAAW,iBAAiB;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,OAAO,CAAC;gBACf,GAAG,EAAE,YAAY;IAW7B;;;;;;OAMG;IACG,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM;IAuBxE;;;;;OAKG;IACG,UAAU,CAAC,MAAM,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM;IAoCrE;;OAEG;IACH,aAAa,IAAI,KAAK,CAAC,uBAAuB,CAAC;IAIzC,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAQvC;;;;;OAKG;WACU,IAAI,CACf,KAAK,CAAC,EAAE,KAAK,EACb,UAAU,GAAE,aAAiD,GAC5D,OAAO,CAAC,SAAS,EAAE,CAAC;IA8BvB;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAY9C;;;;;OAKG;WACU,MAAM,CACjB,GAAG,EAAE,YAAY,EACjB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,SAAS,CAAC;IAiCrB;;;;OAIG;WACU,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD;;;OAGG;WACU,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgCzD;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,SAAS,CAAC;IA2BjC;;;OAGG;IACG,SAAS,CACb,GAAG,EAAE,kBAAkB,EACvB,UAAU,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,eAAe,CAAC;IAwB3B;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAMnC;;;OAGG;IACG,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7C;;;OAGG;IACH,UAAU,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,CAAC,uBAAuB,CAAC;IAKtD,iBAAiB,IAAI,gBAAgB;CAGtC;AAGD,kBAAU,SAAS,CAAC;IAClB,KAAY,gBAAgB,GAAG;QAC7B,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,aAAK,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAC;AAEnD,SAAS,SAAS,CAAC"}
|
|
@@ -47,6 +47,7 @@ class PageGroup {
|
|
|
47
47
|
? cfg.members.map((m) => new page_group_member_1.default(m))
|
|
48
48
|
: [];
|
|
49
49
|
this.min_role = cfg.min_role || 100;
|
|
50
|
+
this.random_allocation = cfg.random_allocation || false;
|
|
50
51
|
}
|
|
51
52
|
/**
|
|
52
53
|
* determine the first page in the group that matches the client screen size
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page_group.js","sourceRoot":"","sources":["../../models/page_group.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAuB;AAKvB,kDAA0B;AAM1B,qDAA6B;AAC7B,MAAM,EAAE,SAAS,EAAE,GAAG,eAAK,CAAC;AAE5B,4EAAkD;AAClD,8DAAsC;AACtC,MAAM,EAAE,eAAe,EAAE,GAAG,oBAAU,CAAC;AAEvC;;;;;GAKG;AACH,MAAM,SAAS;IAMb,YAAY,GAAiB;QAC3B,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO;YACxB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAA0B,EAAE,EAAE,CAAC,IAAI,2BAAe,CAAC,CAAC,CAAC,CAAC;YACzE,CAAC,CAAC,EAAE,CAAC;QACP,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC;IACtC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,eAAe,CAAC,IAAsB,EAAE,IAAS,EAAE,MAAe;QACtE,MAAM,IAAI,GAAG,CAAC,wDAAa,QAAQ,GAAC,CAAC,CAAC,OAAO,CAAC;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;QACpE,MAAM,aAAa,GAAG,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;QAC1D,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE;YAC3B,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,gBAAgB,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;YAC1E,IAAI,GAAG,KAAK,IAAI,EAAE;gBAChB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;gBAClD,IAAI,IAAI,EAAE;oBACR,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ;wBAAE,OAAO,IAAI,CAAC;;wBAE7C,MAAM,OAAO,CAAC,aAAa,CAAC;6BACzB,QAAQ,EAAE;6BACV,GAAG,CACF,CAAC,EACD,QAAQ,IAAI,CAAC,IAAI,kCAAkC,IAAI,CAAC,OAAO,EAAE,CAClE,CAAC;iBACP;aACF;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,CAAC,MAA+B,EAAE,IAAmB;QACnE,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,IAAI;YACF,MAAM,YAAE,CAAC,KAAK,EAAE,CAAC;YACjB,eAAe,GAAG,IAAI,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;YACpE,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC;YACxD,IAAI,GAAG,KAAK,CAAC,CAAC;gBAAE,OAAO;YACvB,IAAI,IAAI,KAAK,IAAI,IAAI,GAAG,GAAG,CAAC,EAAE;gBAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;gBAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC;gBAC1B,MAAM,2BAAe,CAAC,MAAM,CAC1B,IAAI,CAAC,EAAG,EACR,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,EAC7B,IAAI,CACL,CAAC;gBACF,MAAM,2BAAe,CAAC,MAAM,CAAC,MAAM,CAAC,EAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;aACnE;YACD,IAAI,IAAI,KAAK,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;gBAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC;gBAC1B,MAAM,2BAAe,CAAC,MAAM,CAC1B,IAAI,CAAC,EAAG,EACR,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,EAC7B,IAAI,CACL,CAAC;gBACF,MAAM,2BAAe,CAAC,MAAM,CAAC,MAAM,CAAC,EAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;aACnE;YACD,MAAM,YAAE,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,mBAAmB,EAAE,CAAC;SAC/D;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,eAAe;gBAAE,MAAM,YAAE,CAAC,QAAQ,EAAE,CAAC;YACzC,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAED;;OAEG;IACH,aAAa;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QACnC,OAAO,CAAC,YAAE,CAAC,QAAQ;YACjB,CAAC,CAAC,MAAM,cAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC;YAC1C,CAAC,CAAC,CAAC,MAAM,cAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,KAAa,EACb,aAA4B,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE;QAE7D,IAAI,UAAU,CAAC,MAAM,EAAE;YACrB,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;YAC5C,OAAO,QAAQ,EAAE;iBACd,WAAW,CAAC,GAAG,CAAC,CAAC,CAAY,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;iBACnD,MAAM,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;SACnC;QACD,MAAM,QAAQ,GAAG,MAAM,YAAE,CAAC,MAAM,CAAC,iBAAiB,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAe,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,CAAC,YAAE,CAAC,QAAQ;YAC1B,CAAC,CAAC,MAAM,YAAE,CAAC,MAAM,CAAC,wBAAwB,EAAE;gBACxC,aAAa,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;aAChC,CAAC;YACJ,CAAC,CAAC,CAAC,MAAM,YAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC,CAAC,MAAM,CAChD,CAAC,CAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAC3D,CAAC;QACN,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,MAAW,EAAE,EAAE;YAC7D,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YAC5D,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvC,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAqB,EAAE,EAAE;YAC5C,MAAM,OAAO,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,EAAG,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,IAAI,2BAAe,CAAC,CAAC,CAAC,CAClD,CAAC;YACF,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;YAC1B,OAAO,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,KAAY;QACzB,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,CAAC,GAAG,QAAQ,EAAE,CAAC,WAAW,CAAC,IAAI,CACnC,KAAK,CAAC,EAAE;YACN,CAAC,CAAC,CAAC,CAAY,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;YACtC,CAAC,CAAC,KAAK,CAAC,IAAI;gBACZ,CAAC,CAAC,CAAC,CAAY,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI;gBACzC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CACrB,CAAC;QACF,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,GAAiB,EACjB,aAAuB,CAAC,0BAA0B;;QAElD,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC;QACxC,SAAS,CAAC,OAAO,GAAG,EAAE,CAAC;QACvB,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC;QAC3C,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,IAAI;YACF,IAAI,CAAC,aAAa,EAAE;gBAClB,MAAM,YAAE,CAAC,KAAK,EAAE,CAAC;gBACjB,eAAe,GAAG,IAAI,CAAC;aACxB;YACD,MAAM,GAAG,GAAG,MAAM,YAAE,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;YACrD,SAAS,CAAC,EAAE,GAAG,GAAG,CAAC;YACnB,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE;gBAClC,MAAM,SAAS,CAAC,SAAS,CACvB;oBACE,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;oBACzC,WAAW,EAAE,MAAM,CAAC,WAAW;iBAChC,EACD,IAAI,CACL,CAAC;aACH;YACD,IAAI,eAAe;gBAAE,MAAM,YAAE,CAAC,MAAM,EAAE,CAAC;SACxC;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,eAAe;gBAAE,MAAM,YAAE,CAAC,QAAQ,EAAE,CAAC;YACzC,MAAM,CAAC,CAAC;SACT;QACD,IAAI,CAAC,aAAa;YAChB,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,mBAAmB,EAAE,CAAC;QAChE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,GAAQ;QACtC,MAAM,YAAE,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,mBAAmB,EAAE,CAAC;IAChE,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAqB;QACvC,IAAI;YACF,MAAM,YAAE,CAAC,KAAK,EAAE,CAAC;YACjB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,MAAM,EAAE,GAAG,KAAK,CAAC;gBACjB,MAAM,YAAE,CAAC,WAAW,CAAC,wBAAwB,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC;gBACtE,MAAM,YAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;aACjD;iBAAM;gBACL,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/C,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBACzB,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACjD,IAAI,CAAC,YAAE,CAAC,QAAQ;wBACd,MAAM,YAAE,CAAC,WAAW,CAAC,wBAAwB,EAAE;4BAC7C,aAAa,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE;yBACpC,CAAC,CAAC;;wBAEH,YAAE,CAAC,KAAK,CACN,8DAA8D,YAAY,CAAC,IAAI,CAC7E,GAAG,CACJ,GAAG,CACL,CAAC;oBACJ,MAAM,YAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;iBAChD;aACF;YACD,MAAM,YAAE,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,mBAAmB,EAAE,CAAC;SAC/D;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,YAAE,CAAC,QAAQ,EAAE,CAAC;YACpB,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM;QACV,IAAI,CAAC,IAAI,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC1E,MAAM,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK;QACT,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,IAAI;YACF,MAAM,YAAE,CAAC,KAAK,EAAE,CAAC;YACjB,eAAe,GAAG,IAAI,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;YACrC,IAAI,OAAO,CAAC;YACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;gBAC5B,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAC9C,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBACtD,IAAI,CAAC,QAAQ;oBAAE,MAAM;aACtB;YACD,MAAM,SAAS,GAAG;gBAChB,GAAG,IAAI;gBACP,IAAI,EAAE,OAAO;aACd,CAAC;YACF,OAAO,SAAS,CAAC,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACzD,MAAM,YAAE,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,mBAAmB,EAAE,CAAC;YAC9D,OAAO,QAAQ,CAAC;SACjB;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,eAAe;gBAAE,MAAM,YAAE,CAAC,QAAQ,EAAE,CAAC;YACzC,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,SAAS,CACb,GAAuB,EACvB,UAAoB;QAEpB,MAAM,eAAe,GAAG,CAAC,wDAAa,qBAAqB,GAAC,CAAC,CAAC,OAAO,CAAC;QACtE,IAAI,CAAC,IAAI,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACpE,MAAM,MAAM,GACV,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC;YACtB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC,CAAC;QACR,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,MAAM,CAC5C;YACE,aAAa,EAAE,IAAI,CAAC,EAAE;YACtB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,QAAQ,EAAE,MAAM,GAAG,CAAC;YACpB,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;YACtC,WAAW,EAAE,GAAG,CAAC,WAAW;SAC7B,EACD,IAAI,CACL,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,IAAI,CAAC,UAAU;YACb,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,mBAAmB,EAAE,CAAC;QAChE,OAAO,IAAI,eAAe,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY;QAChB,MAAM,YAAE,CAAC,WAAW,CAAC,wBAAwB,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,mBAAmB,EAAE,CAAC;IAChE,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,YAAY,CAAC,EAAU;QAC3B,MAAM,eAAe,GAAG,CAAC,wDAAa,qBAAqB,GAAC,CAAC,CAAC,OAAO,CAAC;QACtE,MAAM,eAAe,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,mBAAmB,EAAE,CAAC;IAChE,CAAC;IAED;;;OAGG;IACH,UAAU,CAAC,KAAU;QACnB,MAAM,IAAI,GAAG,2BAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,iBAAiB;QACf,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAcD,iBAAS,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"page_group.js","sourceRoot":"","sources":["../../models/page_group.ts"],"names":[],"mappings":"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"}
|
package/dist/models/table.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { Where, SelectOptions, Row, JoinOptions } from "@saltcorn/db-common
|
|
|
2
2
|
import Field from "./field";
|
|
3
3
|
import type { AbstractTable, TableCfg, TablePack } from "@saltcorn/types/model-abstracts/abstract_table";
|
|
4
4
|
import type { ForUserRequest } from "@saltcorn/types/model-abstracts/abstract_user";
|
|
5
|
-
import type { ResultMessage } from "@saltcorn/types/common_types";
|
|
5
|
+
import type { ResultMessage, Type } from "@saltcorn/types/common_types";
|
|
6
6
|
import type TableConstraint from "./table_constraints";
|
|
7
7
|
import type { AbstractTag } from "@saltcorn/types/model-abstracts/abstract_tag";
|
|
8
8
|
import type { JoinFieldOption, RelationOption } from "@saltcorn/types/base_types";
|
|
@@ -360,10 +360,10 @@ declare class Table implements AbstractTable {
|
|
|
360
360
|
* @param resultCollector
|
|
361
361
|
* @returns
|
|
362
362
|
*/
|
|
363
|
-
updateRow(v_in: any, id:
|
|
363
|
+
updateRow(v_in: any, id: any, user?: Row, noTrigger?: boolean, resultCollector?: object, restore_of_version?: any, syncTimestamp?: Date): Promise<string | void>;
|
|
364
364
|
private insert_history_row;
|
|
365
|
-
latestSyncInfo(id:
|
|
366
|
-
latestSyncInfos(ids:
|
|
365
|
+
latestSyncInfo(id: any): Promise<any>;
|
|
366
|
+
latestSyncInfos(ids: any[]): Promise<any>;
|
|
367
367
|
private insertSyncInfo;
|
|
368
368
|
private updateSyncInfo;
|
|
369
369
|
/**
|
|
@@ -387,6 +387,7 @@ declare class Table implements AbstractTable {
|
|
|
387
387
|
* @type {string}
|
|
388
388
|
*/
|
|
389
389
|
get pk_name(): string;
|
|
390
|
+
get pk_type(): Type;
|
|
390
391
|
/**
|
|
391
392
|
* Check table constraints against a row object. Will return a string With an error message if the
|
|
392
393
|
* table constraints are violated, `undefined` if the row does not violate any constraints
|
|
@@ -570,6 +571,19 @@ declare class Table implements AbstractTable {
|
|
|
570
571
|
* @returns {Promise<{child_relations: object[], child_field_list: object[]}>}
|
|
571
572
|
*/
|
|
572
573
|
get_child_relations(allow_join_aggregations?: boolean): Promise<ChildRelations>;
|
|
574
|
+
/**
|
|
575
|
+
* Returns aggregations for this table, possibly on a subset by where-expression
|
|
576
|
+
*/
|
|
577
|
+
aggregationQuery(aggregations: {
|
|
578
|
+
[nm: string]: {
|
|
579
|
+
field?: string;
|
|
580
|
+
valueFormula?: string;
|
|
581
|
+
aggregate: string;
|
|
582
|
+
};
|
|
583
|
+
}, options?: {
|
|
584
|
+
where?: any;
|
|
585
|
+
groupBy?: string[] | string;
|
|
586
|
+
}): Promise<any>;
|
|
573
587
|
/**
|
|
574
588
|
*
|
|
575
589
|
* @param opts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../models/table.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,KAAK,EACL,aAAa,EACb,GAAG,EAEH,WAAW,EAEZ,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,KAAK,EACV,aAAa,EACb,QAAQ,EACR,SAAS,EACV,MAAM,gDAAgD,CAAC;AAExD,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,+CAA+C,CAAC;AAEvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../models/table.ts"],"names":[],"mappings":"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"}
|
package/dist/models/table.js
CHANGED
|
@@ -49,6 +49,7 @@ const { prefixFieldsInWhere, InvalidConfiguration, InvalidAdminAction, satisfies
|
|
|
49
49
|
const tags_1 = __importDefault(require("@saltcorn/markup/tags"));
|
|
50
50
|
const { text } = tags_1.default;
|
|
51
51
|
const table_helper_1 = require("./internal/table_helper");
|
|
52
|
+
const query_1 = require("./internal/query");
|
|
52
53
|
/**
|
|
53
54
|
* Transponce Objects
|
|
54
55
|
* TODO more detailed explanation
|
|
@@ -465,7 +466,7 @@ class Table {
|
|
|
465
466
|
if (ug_to_me) {
|
|
466
467
|
opts.push({
|
|
467
468
|
label: `In ${ugtable.name} user group by ${ug_to_me.label}`,
|
|
468
|
-
value: `Fml:user.${ugtable.name}_by_${ug_to_user.name}.map(g=>g.${ug_to_me.name}).includes(${this.pk_name}) /* User group ${ugtable.name} */`,
|
|
469
|
+
value: `Fml:user.${(0, internal_1.sqlsanitize)(ugtable.name)}_by_${ug_to_user.name}.map(g=>g.${ug_to_me.name}).includes(${this.pk_name}) /* User group ${ugtable.name} */`,
|
|
469
470
|
});
|
|
470
471
|
}
|
|
471
472
|
// there is a field from this table to user group
|
|
@@ -741,8 +742,7 @@ class Table {
|
|
|
741
742
|
await this.addDeleteSyncInfo(delIds, dbTime);
|
|
742
743
|
}
|
|
743
744
|
}
|
|
744
|
-
if (fields.find((f) => f.primary_key))
|
|
745
|
-
await this.resetSequence();
|
|
745
|
+
//if (fields.find((f) => f.primary_key)) await this.resetSequence();
|
|
746
746
|
for (const file of deleteFiles) {
|
|
747
747
|
await file.delete();
|
|
748
748
|
}
|
|
@@ -1081,7 +1081,7 @@ class Table {
|
|
|
1081
1081
|
...v,
|
|
1082
1082
|
[pk_name]: id,
|
|
1083
1083
|
_version: {
|
|
1084
|
-
next_version_by_id:
|
|
1084
|
+
next_version_by_id: id,
|
|
1085
1085
|
},
|
|
1086
1086
|
_time: new Date(),
|
|
1087
1087
|
_userid: user?.id,
|
|
@@ -1138,25 +1138,32 @@ class Table {
|
|
|
1138
1138
|
const schema = db_1.default.getTenantSchemaPrefix();
|
|
1139
1139
|
const dbResult = await db_1.default.query(`select max(last_modified) "last_modified", ref
|
|
1140
1140
|
from ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info"
|
|
1141
|
-
group by ref having ref
|
|
1141
|
+
group by ref having ref = ${db_1.default.isSQLite ? "" : "ANY"} ($1)`, [ids]);
|
|
1142
1142
|
return dbResult.rows;
|
|
1143
1143
|
}
|
|
1144
1144
|
async insertSyncInfo(id, syncTimestamp) {
|
|
1145
1145
|
const schema = db_1.default.getTenantSchemaPrefix();
|
|
1146
1146
|
if (isNode()) {
|
|
1147
|
-
await db_1.default.query(`insert into ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" values($
|
|
1148
|
-
date_trunc('milliseconds', to_timestamp($
|
|
1147
|
+
await db_1.default.query(`insert into ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" values($1,
|
|
1148
|
+
date_trunc('milliseconds', to_timestamp($2)))`, [
|
|
1149
|
+
id,
|
|
1150
|
+
(syncTimestamp ? syncTimestamp : await db_1.default.time()).valueOf() / 1000.0,
|
|
1151
|
+
]);
|
|
1149
1152
|
}
|
|
1150
1153
|
else {
|
|
1151
1154
|
await db_1.default.query(`insert into "${db_1.default.sqlsanitize(this.name)}_sync_info"
|
|
1152
1155
|
(ref, modified_local, deleted)
|
|
1153
|
-
values(${id}, true, false)`);
|
|
1156
|
+
values('${id}', true, false)`);
|
|
1154
1157
|
}
|
|
1155
1158
|
}
|
|
1156
1159
|
async updateSyncInfo(id, oldLastModified, syncTimestamp) {
|
|
1157
1160
|
const schema = db_1.default.getTenantSchemaPrefix();
|
|
1158
1161
|
if (!db_1.default.isSQLite) {
|
|
1159
|
-
await db_1.default.query(`update ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" set last_modified=date_trunc('milliseconds', to_timestamp($
|
|
1162
|
+
await db_1.default.query(`update ${schema}"${db_1.default.sqlsanitize(this.name)}_sync_info" set last_modified=date_trunc('milliseconds', to_timestamp($1)) where ref=$2 and last_modified = to_timestamp($3)`, [
|
|
1163
|
+
(syncTimestamp ? syncTimestamp : await db_1.default.time()).valueOf() / 1000.0,
|
|
1164
|
+
id,
|
|
1165
|
+
oldLastModified.valueOf() / 1000.0,
|
|
1166
|
+
]);
|
|
1160
1167
|
}
|
|
1161
1168
|
else {
|
|
1162
1169
|
await db_1.default.query(`update "${db_1.default.sqlsanitize(this.name)}_sync_info" set modified_local = true
|
|
@@ -1205,6 +1212,16 @@ class Table {
|
|
|
1205
1212
|
}
|
|
1206
1213
|
return pkField;
|
|
1207
1214
|
}
|
|
1215
|
+
get pk_type() {
|
|
1216
|
+
const pkField = this.fields?.find((f) => f.primary_key);
|
|
1217
|
+
if (!pkField) {
|
|
1218
|
+
throw new Error("A primary key field is mandatory");
|
|
1219
|
+
}
|
|
1220
|
+
if (!(0, common_types_1.instanceOfType)(pkField.type)) {
|
|
1221
|
+
throw new Error("A primary key field must have a type");
|
|
1222
|
+
}
|
|
1223
|
+
return pkField.type;
|
|
1224
|
+
}
|
|
1208
1225
|
/**
|
|
1209
1226
|
* Check table constraints against a row object. Will return a string With an error message if the
|
|
1210
1227
|
* table constraints are violated, `undefined` if the row does not violate any constraints
|
|
@@ -1341,7 +1358,7 @@ class Table {
|
|
|
1341
1358
|
...v,
|
|
1342
1359
|
[pk_name]: id,
|
|
1343
1360
|
_version: {
|
|
1344
|
-
next_version_by_id:
|
|
1361
|
+
next_version_by_id: id,
|
|
1345
1362
|
},
|
|
1346
1363
|
_userid: user?.id,
|
|
1347
1364
|
_time: new Date(),
|
|
@@ -1376,7 +1393,7 @@ class Table {
|
|
|
1376
1393
|
try {
|
|
1377
1394
|
const id = await this.insertRow(v, user, resultCollector);
|
|
1378
1395
|
if (!id)
|
|
1379
|
-
return { error: "
|
|
1396
|
+
return { error: "Not authorized" };
|
|
1380
1397
|
if (id?.includes?.("Not authorized"))
|
|
1381
1398
|
return { error: id };
|
|
1382
1399
|
if (id?.error)
|
|
@@ -1977,8 +1994,12 @@ class Table {
|
|
|
1977
1994
|
[this.pk_name]: rec[this.pk_name],
|
|
1978
1995
|
});
|
|
1979
1996
|
if (options?.no_table_write) {
|
|
1980
|
-
if (existing)
|
|
1981
|
-
Object.
|
|
1997
|
+
if (existing) {
|
|
1998
|
+
Object.entries(existing).forEach(([k, v]) => {
|
|
1999
|
+
if (typeof rec[k] === "undefined")
|
|
2000
|
+
rec[k] = v;
|
|
2001
|
+
});
|
|
2002
|
+
}
|
|
1982
2003
|
returnedRows.push(rec);
|
|
1983
2004
|
}
|
|
1984
2005
|
else if (existing)
|
|
@@ -2318,6 +2339,55 @@ class Table {
|
|
|
2318
2339
|
}
|
|
2319
2340
|
return { child_relations, child_field_list };
|
|
2320
2341
|
}
|
|
2342
|
+
/**
|
|
2343
|
+
* Returns aggregations for this table, possibly on a subset by where-expression
|
|
2344
|
+
*/
|
|
2345
|
+
async aggregationQuery(aggregations, options) {
|
|
2346
|
+
let fldNms = [];
|
|
2347
|
+
const where0 = options?.where || {};
|
|
2348
|
+
const groupBy = Array.isArray(options?.groupBy)
|
|
2349
|
+
? options?.groupBy
|
|
2350
|
+
: options?.groupBy
|
|
2351
|
+
? [options?.groupBy]
|
|
2352
|
+
: null;
|
|
2353
|
+
const schema = db_1.default.getTenantSchemaPrefix();
|
|
2354
|
+
const { where, values } = (0, internal_1.mkWhere)(where0, db_1.default.isSQLite);
|
|
2355
|
+
Object.entries(aggregations).forEach(([nm, { field, valueFormula, aggregate }]) => {
|
|
2356
|
+
if (field &&
|
|
2357
|
+
(aggregate.startsWith("Percent ") || aggregate.startsWith("Percent "))) {
|
|
2358
|
+
const targetBoolVal = aggregate.split(" ")[1] === "true";
|
|
2359
|
+
fldNms.push(`avg( CASE WHEN "${(0, internal_1.sqlsanitize)(field)}"=${JSON.stringify(!!targetBoolVal)} THEN 100.0 ELSE 0.0 END) as "${(0, internal_1.sqlsanitize)(nm)}"`);
|
|
2360
|
+
}
|
|
2361
|
+
else if (field &&
|
|
2362
|
+
(aggregate.startsWith("Latest ") || aggregate.startsWith("Earliest "))) {
|
|
2363
|
+
const dateField = aggregate.split(" ")[1];
|
|
2364
|
+
const isLatest = aggregate.startsWith("Latest ");
|
|
2365
|
+
let newWhere = where;
|
|
2366
|
+
if (groupBy) {
|
|
2367
|
+
const newClauses = groupBy
|
|
2368
|
+
.map((f) => `innertbl."${f}" = mt."${f}"`)
|
|
2369
|
+
.join(" AND ");
|
|
2370
|
+
if (!newWhere)
|
|
2371
|
+
newWhere = "where " + newClauses;
|
|
2372
|
+
else
|
|
2373
|
+
newWhere = `${newWhere} AND ${newClauses}`;
|
|
2374
|
+
}
|
|
2375
|
+
fldNms.push(`(select ${field ? `"${(0, internal_1.sqlsanitize)(field)}"` : valueFormula} from ${schema}"${(0, internal_1.sqlsanitize)(this.name)}" innertbl ${newWhere} order by "${(0, internal_1.sqlsanitize)(dateField)}" ${isLatest ? "DESC" : "ASC"} limit 1) as "${(0, internal_1.sqlsanitize)(nm)}"`);
|
|
2376
|
+
}
|
|
2377
|
+
else
|
|
2378
|
+
fldNms.push(`${(0, query_1.getAggAndField)(aggregate, field === "Formula" ? undefined : field, field === "Formula" ? valueFormula : undefined)} as "${(0, internal_1.sqlsanitize)(nm)}"`);
|
|
2379
|
+
});
|
|
2380
|
+
if (groupBy) {
|
|
2381
|
+
fldNms.push(...groupBy);
|
|
2382
|
+
}
|
|
2383
|
+
const sql = `SELECT ${fldNms.join()} FROM ${schema}"${(0, internal_1.sqlsanitize)(this.name)}" mt ${where}${groupBy
|
|
2384
|
+
? ` group by ${groupBy.map((f) => (0, internal_1.sqlsanitize)(f)).join(", ")}`
|
|
2385
|
+
: ""}`;
|
|
2386
|
+
const res = await db_1.default.query(sql, values);
|
|
2387
|
+
if (groupBy)
|
|
2388
|
+
return res.rows;
|
|
2389
|
+
return res.rows[0];
|
|
2390
|
+
}
|
|
2321
2391
|
/**
|
|
2322
2392
|
*
|
|
2323
2393
|
* @param opts
|
|
@@ -2416,45 +2486,7 @@ class Table {
|
|
|
2416
2486
|
}
|
|
2417
2487
|
const whereObj = prefixFieldsInWhere(opts.where, "a");
|
|
2418
2488
|
const { where, values } = (0, internal_1.mkWhere)(whereObj, db_1.default.isSQLite);
|
|
2419
|
-
|
|
2420
|
-
let aggValues = []; // for sqlite
|
|
2421
|
-
Object.entries(aggregations).forEach(([fldnm, { table, ref, field, where, aggregate, subselect, through },]) => {
|
|
2422
|
-
let whereStr = "";
|
|
2423
|
-
if (where && !subselect) {
|
|
2424
|
-
const whereAndValues = (0, internal_1.mkWhere)(where, db_1.default.isSQLite, placeCounter);
|
|
2425
|
-
// todo warning deprecated symbol substr is used
|
|
2426
|
-
whereStr = whereAndValues.where.substr(6); // remove "where "
|
|
2427
|
-
if (isNode())
|
|
2428
|
-
values.push(...whereAndValues.values);
|
|
2429
|
-
else
|
|
2430
|
-
aggValues.push(...whereAndValues.values);
|
|
2431
|
-
placeCounter += whereAndValues.values.length;
|
|
2432
|
-
}
|
|
2433
|
-
const aggTable = Table.findOne({ name: table });
|
|
2434
|
-
const aggField = aggTable?.fields?.find((f) => f.name === field);
|
|
2435
|
-
const ownField = through ? (0, internal_1.sqlsanitize)(through) : this.pk_name;
|
|
2436
|
-
const agg_and_field = aggregate.toLowerCase() === "countunique"
|
|
2437
|
-
? `count(distinct ${field ? `"${(0, internal_1.sqlsanitize)(field)}"` : "*"})`
|
|
2438
|
-
: `${(0, internal_1.sqlsanitize)(aggregate)}(${field ? `"${(0, internal_1.sqlsanitize)(field)}"` : "*"})`;
|
|
2439
|
-
if (aggField?.is_fkey &&
|
|
2440
|
-
aggField.attributes.summary_field &&
|
|
2441
|
-
aggregate.toLowerCase() === "array_agg") {
|
|
2442
|
-
const newFld = `(select array_agg(aggjoin."${(0, internal_1.sqlsanitize)(aggField.attributes.summary_field)}") from ${schema}"${(0, internal_1.sqlsanitize)(table)}" aggto join ${schema}"${(0, internal_1.sqlsanitize)(aggField.reftable_name)}" aggjoin on aggto."${(0, internal_1.sqlsanitize)(field)}" = aggjoin.id where aggto."${(0, internal_1.sqlsanitize)(ref)}"=a."${ownField}"${whereStr ? ` and ${whereStr}` : ""}) ${(0, internal_1.sqlsanitize)(fldnm)}`;
|
|
2443
|
-
fldNms.push(newFld);
|
|
2444
|
-
}
|
|
2445
|
-
else if (aggregate.startsWith("Latest ") ||
|
|
2446
|
-
aggregate.startsWith("Earliest ")) {
|
|
2447
|
-
const dateField = aggregate.split(" ")[1];
|
|
2448
|
-
const isLatest = aggregate.startsWith("Latest ");
|
|
2449
|
-
fldNms.push(`(select "${(0, internal_1.sqlsanitize)(field)}" from ${schema}"${(0, internal_1.sqlsanitize)(table)}" where "${dateField}"=(select ${isLatest ? `max` : `min`}("${dateField}") from ${schema}"${(0, internal_1.sqlsanitize)(table)}" where "${(0, internal_1.sqlsanitize)(ref)}"=a."${ownField}"${whereStr ? ` and ${whereStr}` : ""}) and "${(0, internal_1.sqlsanitize)(ref)}"=a."${ownField}" limit 1) ${(0, internal_1.sqlsanitize)(fldnm)}`);
|
|
2450
|
-
}
|
|
2451
|
-
else if (subselect)
|
|
2452
|
-
fldNms.push(`(select ${agg_and_field} from ${schema}"${(0, internal_1.sqlsanitize)(table)}" where "${(0, internal_1.sqlsanitize)(ref)}" in (select "${subselect.field}" from ${schema}"${(0, internal_1.sqlsanitize)(subselect.table.name)}" where "${subselect.whereField}"=a."${ownField}")) ${(0, internal_1.sqlsanitize)(fldnm)}`);
|
|
2453
|
-
else
|
|
2454
|
-
fldNms.push(`(select ${agg_and_field} from ${schema}"${(0, internal_1.sqlsanitize)(table)}" where "${(0, internal_1.sqlsanitize)(ref)}"=a."${ownField}"${whereStr ? ` and ${whereStr}` : ""}) ${(0, internal_1.sqlsanitize)(fldnm)}`);
|
|
2455
|
-
});
|
|
2456
|
-
if (!isNode())
|
|
2457
|
-
values.unshift(...aggValues);
|
|
2489
|
+
(0, query_1.process_aggregations)(this, aggregations, fldNms, values, schema);
|
|
2458
2490
|
const selectopts = {
|
|
2459
2491
|
limit: opts.limit,
|
|
2460
2492
|
orderBy: opts.orderBy &&
|