@saltcorn/data 1.0.0-beta.9 → 1.0.0-rc.2
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 +45 -0
- package/dist/base-plugin/actions.d.ts.map +1 -1
- package/dist/base-plugin/actions.js +23 -0
- package/dist/base-plugin/actions.js.map +1 -1
- package/dist/base-plugin/index.d.ts +111 -83
- package/dist/base-plugin/index.d.ts.map +1 -1
- package/dist/base-plugin/types.d.ts +16 -1
- package/dist/base-plugin/types.d.ts.map +1 -1
- package/dist/base-plugin/types.js +53 -13
- package/dist/base-plugin/types.js.map +1 -1
- package/dist/base-plugin/viewtemplates/edit.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/edit.js +18 -19
- package/dist/base-plugin/viewtemplates/edit.js.map +1 -1
- package/dist/base-plugin/viewtemplates/feed.d.ts +1 -1
- package/dist/base-plugin/viewtemplates/feed.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/feed.js +3 -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 +8 -7
- package/dist/base-plugin/viewtemplates/filter.js.map +1 -1
- package/dist/base-plugin/viewtemplates/list.d.ts +1 -1
- package/dist/base-plugin/viewtemplates/list.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/list.js +26 -24
- package/dist/base-plugin/viewtemplates/list.js.map +1 -1
- package/dist/base-plugin/viewtemplates/listshowlist.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/listshowlist.js +8 -2
- package/dist/base-plugin/viewtemplates/listshowlist.js.map +1 -1
- package/dist/base-plugin/viewtemplates/room.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/room.js +0 -1
- package/dist/base-plugin/viewtemplates/room.js.map +1 -1
- package/dist/base-plugin/viewtemplates/show.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/show.js +32 -22
- package/dist/base-plugin/viewtemplates/show.js.map +1 -1
- package/dist/base-plugin/viewtemplates/viewable_fields.d.ts +1 -1
- package/dist/base-plugin/viewtemplates/viewable_fields.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/viewable_fields.js +7 -3
- package/dist/base-plugin/viewtemplates/viewable_fields.js.map +1 -1
- package/dist/db/state.d.ts +14 -9
- package/dist/db/state.d.ts.map +1 -1
- package/dist/db/state.js +107 -63
- package/dist/db/state.js.map +1 -1
- package/dist/migrate.d.ts.map +1 -1
- package/dist/migrate.js +21 -21
- package/dist/migrate.js.map +1 -1
- package/dist/models/config.d.ts.map +1 -1
- package/dist/models/config.js +21 -1
- package/dist/models/config.js.map +1 -1
- package/dist/models/email.d.ts +1 -1
- package/dist/models/expression.d.ts.map +1 -1
- package/dist/models/expression.js +32 -6
- package/dist/models/expression.js.map +1 -1
- package/dist/models/field.d.ts.map +1 -1
- package/dist/models/field.js +4 -1
- package/dist/models/field.js.map +1 -1
- package/dist/models/fieldrepeat.d.ts.map +1 -1
- package/dist/models/fieldrepeat.js +6 -1
- package/dist/models/fieldrepeat.js.map +1 -1
- package/dist/models/index.d.ts +7 -3
- package/dist/models/index.d.ts.map +1 -1
- package/dist/models/internal/query.d.ts.map +1 -1
- package/dist/models/internal/query.js +10 -7
- package/dist/models/internal/query.js.map +1 -1
- package/dist/models/library.d.ts.map +1 -1
- package/dist/models/library.js +0 -4
- package/dist/models/library.js.map +1 -1
- package/dist/models/plugin.d.ts +2 -1
- package/dist/models/plugin.d.ts.map +1 -1
- package/dist/models/plugin.js +9 -2
- package/dist/models/plugin.js.map +1 -1
- package/dist/models/scheduler.d.ts +7 -11
- package/dist/models/scheduler.d.ts.map +1 -1
- package/dist/models/scheduler.js +26 -1
- package/dist/models/scheduler.js.map +1 -1
- package/dist/models/table.d.ts +1 -1
- package/dist/models/table.d.ts.map +1 -1
- package/dist/models/table.js +50 -22
- package/dist/models/table.js.map +1 -1
- package/dist/models/tag.d.ts.map +1 -1
- package/dist/models/tag.js +3 -0
- package/dist/models/tag.js.map +1 -1
- package/dist/models/trigger.d.ts +17 -0
- package/dist/models/trigger.d.ts.map +1 -1
- package/dist/models/trigger.js +63 -1
- package/dist/models/trigger.js.map +1 -1
- package/dist/models/user.d.ts +1 -1
- package/dist/models/user.d.ts.map +1 -1
- package/dist/models/user.js +17 -6
- package/dist/models/user.js.map +1 -1
- package/dist/plugin-helper.d.ts +25 -1
- package/dist/plugin-helper.d.ts.map +1 -1
- package/dist/plugin-helper.js +77 -7
- package/dist/plugin-helper.js.map +1 -1
- package/dist/plugin-testing.d.ts.map +1 -1
- package/dist/plugin-testing.js +2 -0
- package/dist/plugin-testing.js.map +1 -1
- package/dist/tests/actions.test.js +66 -1
- package/dist/tests/actions.test.js.map +1 -1
- package/dist/tests/auth.test.js +6 -2
- package/dist/tests/auth.test.js.map +1 -1
- package/dist/tests/auxtest.test.js +44 -2
- package/dist/tests/auxtest.test.js.map +1 -1
- package/dist/tests/calc.test.js +26 -1
- package/dist/tests/calc.test.js.map +1 -1
- package/dist/tests/exact_views.test.js +19 -19
- package/dist/tests/exact_views.test.js.map +1 -1
- package/dist/tests/field.test.js +9 -0
- package/dist/tests/field.test.js.map +1 -1
- package/dist/tests/mocks.d.ts +13 -0
- package/dist/tests/mocks.d.ts.map +1 -1
- package/dist/tests/mocks.js +8 -0
- package/dist/tests/mocks.js.map +1 -1
- package/dist/tests/show.test.js +182 -3
- package/dist/tests/show.test.js.map +1 -1
- package/dist/tests/table.test.js +46 -18
- package/dist/tests/table.test.js.map +1 -1
- package/dist/tests/table_history.test.js +28 -0
- package/dist/tests/table_history.test.js.map +1 -1
- package/dist/utils.d.ts +4 -2
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +32 -3
- package/dist/utils.js.map +1 -1
- package/package.json +8 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../models/plugin.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../models/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
* @returns {Promise<void>}
|
|
9
|
-
*/
|
|
10
|
-
declare const runScheduler: ({ stop_when, tickSeconds, watchReaper, port, disableScheduler, eachTenant, auto_backup_now, take_snapshot, }?: any) => Promise<void>;
|
|
11
|
-
export = runScheduler;
|
|
1
|
+
import Trigger from "./trigger";
|
|
2
|
+
declare const _default: {
|
|
3
|
+
runScheduler: ({ stop_when, tickSeconds, watchReaper, port, disableScheduler, eachTenant, auto_backup_now, take_snapshot, }?: any) => Promise<void>;
|
|
4
|
+
getDailyTriggersDueNow: (tickSeconds: number) => Trigger[];
|
|
5
|
+
getWeeklyTriggersDueNow: (tickSeconds: number) => Trigger[];
|
|
6
|
+
};
|
|
7
|
+
export = _default;
|
|
12
8
|
//# sourceMappingURL=scheduler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../models/scheduler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../models/scheduler.ts"],"names":[],"mappings":"AAMA,OAAO,OAAO,MAAM,WAAW,CAAC;;;;;;AAmShC,kBAA2E"}
|
package/dist/models/scheduler.js
CHANGED
|
@@ -41,6 +41,7 @@ const intervalIsNow = async (name) => {
|
|
|
41
41
|
return due < now;
|
|
42
42
|
};
|
|
43
43
|
const regexHHMM = /^([0-1]?[0-9]|2[0-3]):([0-5][0-9])$/;
|
|
44
|
+
const regexDDHHMM = /^([a-zA-Z]*) ([0-1]?[0-9]|2[0-3]) ([0-5][0-9])$/;
|
|
44
45
|
/**
|
|
45
46
|
* @param {string} name
|
|
46
47
|
* @param {number} hours
|
|
@@ -63,6 +64,25 @@ const getDailyTriggersDueNow = (tickSeconds) => {
|
|
|
63
64
|
return time_to_run >= now && time_to_run < nextTick;
|
|
64
65
|
});
|
|
65
66
|
};
|
|
67
|
+
const getWeeklyTriggersDueNow = (tickSeconds) => {
|
|
68
|
+
let triggers = trigger_1.default.find({ when_trigger: "Weekly" });
|
|
69
|
+
return triggers.filter((tr) => {
|
|
70
|
+
if (!tr.channel)
|
|
71
|
+
return false;
|
|
72
|
+
const m = tr.channel.match?.(regexDDHHMM);
|
|
73
|
+
if (!m)
|
|
74
|
+
return false;
|
|
75
|
+
const now = new Date();
|
|
76
|
+
if (m[1] !== now.toLocaleString("en-us", { weekday: "long" }))
|
|
77
|
+
return false;
|
|
78
|
+
const time_to_run = new Date();
|
|
79
|
+
time_to_run.setUTCHours(+m[2]);
|
|
80
|
+
time_to_run.setMinutes(+m[3]);
|
|
81
|
+
const nextTick = new Date();
|
|
82
|
+
nextTick.setSeconds(nextTick.getSeconds() + tickSeconds);
|
|
83
|
+
return time_to_run >= now && time_to_run < nextTick;
|
|
84
|
+
});
|
|
85
|
+
};
|
|
66
86
|
const getIntervalTriggersDueNow = async (name, hours) => {
|
|
67
87
|
const state = getState();
|
|
68
88
|
const cfgField = `next_${name.toLowerCase()}_event`;
|
|
@@ -88,6 +108,9 @@ const getIntervalTriggersDueNow = async (name, hours) => {
|
|
|
88
108
|
if (name === "Daily") {
|
|
89
109
|
triggers = triggers.filter((tr) => !tr.channel || !tr.channel.match?.(regexHHMM));
|
|
90
110
|
}
|
|
111
|
+
if (name === "Weekly") {
|
|
112
|
+
triggers = triggers.filter((tr) => !tr.channel || !tr.channel.match?.(regexDDHHMM));
|
|
113
|
+
}
|
|
91
114
|
due.setHours(due.getHours() + hours);
|
|
92
115
|
if (now > due) {
|
|
93
116
|
// we must have skipped events, e.g. if not running continuously
|
|
@@ -174,6 +197,7 @@ const runScheduler = async ({ stop_when = () => false, tickSeconds = 60 * 5, wat
|
|
|
174
197
|
const trsHourly = await getIntervalTriggersDueNow("Hourly", 1);
|
|
175
198
|
const trsDaily = await getIntervalTriggersDueNow("Daily", 24);
|
|
176
199
|
const trsDailyNowTime = getDailyTriggersDueNow(tickSeconds);
|
|
200
|
+
const trsWeeklyNowTime = getWeeklyTriggersDueNow(tickSeconds);
|
|
177
201
|
const trsWeekly = await getIntervalTriggersDueNow("Weekly", 24 * 7);
|
|
178
202
|
const allTriggers = [
|
|
179
203
|
...triggers,
|
|
@@ -181,6 +205,7 @@ const runScheduler = async ({ stop_when = () => false, tickSeconds = 60 * 5, wat
|
|
|
181
205
|
...trsDaily,
|
|
182
206
|
...trsWeekly,
|
|
183
207
|
...trsDailyNowTime,
|
|
208
|
+
...trsWeeklyNowTime,
|
|
184
209
|
];
|
|
185
210
|
for (const trigger of allTriggers) {
|
|
186
211
|
try {
|
|
@@ -237,5 +262,5 @@ const runScheduler = async ({ stop_when = () => false, tickSeconds = 60 * 5, wat
|
|
|
237
262
|
await run();
|
|
238
263
|
}
|
|
239
264
|
};
|
|
240
|
-
module.exports = runScheduler;
|
|
265
|
+
module.exports = { runScheduler, getDailyTriggersDueNow, getWeeklyTriggersDueNow };
|
|
241
266
|
//# sourceMappingURL=scheduler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../models/scheduler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../models/scheduler.ts"],"names":[],"mappings":"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"}
|
package/dist/models/table.d.ts
CHANGED
|
@@ -386,7 +386,7 @@ declare class Table implements AbstractTable {
|
|
|
386
386
|
* @param resultCollector
|
|
387
387
|
* @returns
|
|
388
388
|
*/
|
|
389
|
-
updateRow(v_in: any, id: any, user?: Row, noTrigger?: boolean, resultCollector?: object, restore_of_version?: any, syncTimestamp?: Date): Promise<string | void>;
|
|
389
|
+
updateRow(v_in: any, id: any, user?: Row, noTrigger?: boolean, resultCollector?: object, restore_of_version?: any, syncTimestamp?: Date, additionalTriggerValues?: Row): Promise<string | void>;
|
|
390
390
|
insert_history_row(v0: any, retry?: number): Promise<void>;
|
|
391
391
|
latestSyncInfo(id: any): Promise<any>;
|
|
392
392
|
latestSyncInfos(ids: any[]): Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../models/table.ts"],"names":[],"mappings":"AAcA,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,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAmBxE,OAAO,KAAK,eAAe,MAAM,qBAAqB,CAAC;AA0BvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACf,MAAM,4BAA4B,CAAC;AAyCpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiFG;AACH,cAAM,KAAM,YAAW,aAAa;IAClC,qBAAqB;IACrB,IAAI,EAAE,MAAM,CAAC;IAEb,mBAAmB;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,2BAA2B;IAC3B,aAAa,EAAE,MAAM,CAAC;IAEtB,4BAA4B;IAC5B,cAAc,EAAE,MAAM,CAAC;IAEvB,mCAAmC;IACnC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B;uDACmD;IACnD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,6CAA6C;IAC7C,SAAS,EAAE,OAAO,CAAC;IAEnB,kEAAkE;IAClE,aAAa,EAAE,OAAO,CAAC;IAEvB,+DAA+D;IAC/D,QAAQ,EAAE,OAAO,CAAC;IAElB,gDAAgD;IAChD,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,+CAA+C;IAC/C,MAAM,EAAE,KAAK,EAAE,CAAC;IAEhB,0DAA0D;IAC1D,WAAW,EAAE,eAAe,EAAE,CAAC;IAE/B,uFAAuF;IACvF,aAAa,EAAE,OAAO,CAAC;IAEvB,uEAAuE;IACvE,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,0DAA0D;IAC1D,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB;;;OAGG;gBACS,CAAC,EAAE,QAAQ;IAmBvB,IAAI,OAAO;;;;;;;;;;;;MAcV;IAED,iBAAiB;IA0BjB;;;;;;OAMG;IACH,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,IAAI;IA+BpE;;;;;OAKG;WACU,IAAI,CACf,KAAK,CAAC,EAAE,KAAK,EACb,UAAU,GAAE,aAAiD,GAC5D,OAAO,CAAC,KAAK,EAAE,CAAC;IA6CnB;;;;;OAKG;WACU,kBAAkB,CAC7B,MAAM,GAAE,KAAU,EAClB,UAAU,GAAE,aAAiD,GAC5D,OAAO,CAAC,KAAK,EAAE,CAAC;IA8BnB;;;;OAIG;IACG,UAAU,CAAC,IAAI,CAAC,EAAE,GAAG;IAO3B;;;;OAIG;IACH,2BAA2B,CACzB,MAAM,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI,GACtB,MAAM,GAAG,IAAI,GAAG,SAAS;IAM5B;;;OAGG;IACH,eAAe,IAAI,MAAM,GAAG,IAAI,GAAG,SAAS;IAM5C;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO;
|
|
1
|
+
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../models/table.ts"],"names":[],"mappings":"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"}
|
package/dist/models/table.js
CHANGED
|
@@ -384,7 +384,8 @@ class Table {
|
|
|
384
384
|
// users are owners of their own row in users table
|
|
385
385
|
if (this.name === "users" && !field_name)
|
|
386
386
|
return user.id && `${row?.id}` === `${user.id}`;
|
|
387
|
-
return typeof field_name === "string" &&
|
|
387
|
+
return (typeof field_name === "string" &&
|
|
388
|
+
(row[field_name] === user.id || row[field_name]?.id === user.id));
|
|
388
389
|
}
|
|
389
390
|
/**
|
|
390
391
|
* get Ownership options
|
|
@@ -1052,7 +1053,7 @@ class Table {
|
|
|
1052
1053
|
* @param resultCollector
|
|
1053
1054
|
* @returns
|
|
1054
1055
|
*/
|
|
1055
|
-
async updateRow(v_in, id, user, noTrigger, resultCollector, restore_of_version, syncTimestamp) {
|
|
1056
|
+
async updateRow(v_in, id, user, noTrigger, resultCollector, restore_of_version, syncTimestamp, additionalTriggerValues) {
|
|
1056
1057
|
let existing;
|
|
1057
1058
|
let v = { ...v_in };
|
|
1058
1059
|
const fields = this.fields;
|
|
@@ -1086,7 +1087,7 @@ class Table {
|
|
|
1086
1087
|
const owner_field = fields.find((f) => f.id === this.ownership_field_id);
|
|
1087
1088
|
if (!owner_field)
|
|
1088
1089
|
throw new Error(`Owner field in table ${this.name} not found`);
|
|
1089
|
-
if (v[owner_field.name] && v[owner_field.name]
|
|
1090
|
+
if (v[owner_field.name] && v[owner_field.name] != user.id) {
|
|
1090
1091
|
state.log(4, `Not authorized to updateRow in table ${this.name}. ${user.id} does not match owner field in updates`);
|
|
1091
1092
|
return "Not authorized";
|
|
1092
1093
|
}
|
|
@@ -1145,7 +1146,7 @@ class Table {
|
|
|
1145
1146
|
joinFields,
|
|
1146
1147
|
});
|
|
1147
1148
|
const valResCollector = resultCollector || {};
|
|
1148
|
-
await trigger_1.default.runTableTriggers("Validate", this, { ...existing, ...v }, valResCollector, user, { old_row: existing, updated_fields: v_in });
|
|
1149
|
+
await trigger_1.default.runTableTriggers("Validate", this, { ...(additionalTriggerValues || {}), ...existing, ...v }, valResCollector, user, { old_row: existing, updated_fields: v_in });
|
|
1149
1150
|
if ("error" in valResCollector)
|
|
1150
1151
|
return valResCollector.error;
|
|
1151
1152
|
if ("set_fields" in valResCollector)
|
|
@@ -1184,17 +1185,21 @@ class Table {
|
|
|
1184
1185
|
const existing1 = await db_1.default.selectOne(this.name, { [pk_name]: id });
|
|
1185
1186
|
if (!existing)
|
|
1186
1187
|
existing = existing1;
|
|
1187
|
-
|
|
1188
|
-
|
|
1189
|
-
|
|
1190
|
-
|
|
1191
|
-
|
|
1192
|
-
|
|
1193
|
-
|
|
1194
|
-
|
|
1195
|
-
|
|
1196
|
-
|
|
1197
|
-
|
|
1188
|
+
//store all changes EXCEPT users with only last_mobile_login
|
|
1189
|
+
if (!(this.name === "users" &&
|
|
1190
|
+
Object.keys(v_in).length == 1 &&
|
|
1191
|
+
v_in.last_mobile_login))
|
|
1192
|
+
await this.insert_history_row({
|
|
1193
|
+
...existing1,
|
|
1194
|
+
...v,
|
|
1195
|
+
[pk_name]: id,
|
|
1196
|
+
_version: {
|
|
1197
|
+
next_version_by_id: id,
|
|
1198
|
+
},
|
|
1199
|
+
_time: new Date(),
|
|
1200
|
+
_userid: user?.id,
|
|
1201
|
+
_restore_of_version: restore_of_version || null,
|
|
1202
|
+
});
|
|
1198
1203
|
}
|
|
1199
1204
|
if (typeof existing === "undefined") {
|
|
1200
1205
|
const triggers = await trigger_1.default.getTableTriggers("Update", this);
|
|
@@ -1222,7 +1227,7 @@ class Table {
|
|
|
1222
1227
|
const newRow = { ...existing, ...v, [pk_name]: id };
|
|
1223
1228
|
await this.auto_update_calc_aggregations(newRow, !existing);
|
|
1224
1229
|
if (!noTrigger) {
|
|
1225
|
-
const trigPromise = trigger_1.default.runTableTriggers("Update", this, newRow, resultCollector, role === 100 ? undefined : user, { old_row: existing, updated_fields: v_in });
|
|
1230
|
+
const trigPromise = trigger_1.default.runTableTriggers("Update", this, { ...(additionalTriggerValues || {}), ...newRow }, resultCollector, role === 100 ? undefined : user, { old_row: existing, updated_fields: v_in });
|
|
1226
1231
|
if (resultCollector)
|
|
1227
1232
|
await trigPromise;
|
|
1228
1233
|
}
|
|
@@ -1237,6 +1242,8 @@ class Table {
|
|
|
1237
1242
|
calcFields.forEach((f) => {
|
|
1238
1243
|
// delete v1[f.name];
|
|
1239
1244
|
});
|
|
1245
|
+
if (this.name === "users")
|
|
1246
|
+
delete v1.last_mobile_login;
|
|
1240
1247
|
this.stringify_json_fields(v1);
|
|
1241
1248
|
if (retry < 3) {
|
|
1242
1249
|
try {
|
|
@@ -1421,7 +1428,7 @@ class Table {
|
|
|
1421
1428
|
const owner_field = fields.find((f) => f.id === this.ownership_field_id);
|
|
1422
1429
|
if (!owner_field)
|
|
1423
1430
|
throw new Error(`Owner field in table ${this.name} not found`);
|
|
1424
|
-
if (v_in[owner_field.name]
|
|
1431
|
+
if (v_in[owner_field.name] != user.id) {
|
|
1425
1432
|
state.log(4, `Not authorized to insertRow in table ${this.name}. ${user.id} does not match owner field`);
|
|
1426
1433
|
return;
|
|
1427
1434
|
}
|
|
@@ -1674,7 +1681,13 @@ class Table {
|
|
|
1674
1681
|
// todo create function that returns history table name for table
|
|
1675
1682
|
async create_history_table() {
|
|
1676
1683
|
const schemaPrefix = db_1.default.getTenantSchemaPrefix();
|
|
1677
|
-
const fields = this.fields;
|
|
1684
|
+
const fields = [...this.fields];
|
|
1685
|
+
if (this.name === "users")
|
|
1686
|
+
fields.push(new field_1.default({ name: "password", type: "String" }), new field_1.default({ name: "reset_password_token", type: "String" }), new field_1.default({ name: "reset_password_expiry", type: "Date" }), new field_1.default({ name: "language", type: "String" }), new field_1.default({ name: "disabled", type: "Bool" }), new field_1.default({ name: "api_token", type: "String" }), new field_1.default({ name: "verification_token", type: "String" }), new field_1.default({ name: "verified_on", type: "Date" })
|
|
1687
|
+
// Not last_mobile_login - we do not want to store this in history.
|
|
1688
|
+
// Deleted in Table.insert_history_row instead
|
|
1689
|
+
//new Field({ name: "last_mobile_login", type: "Date" })
|
|
1690
|
+
);
|
|
1678
1691
|
const flds = fields
|
|
1679
1692
|
.filter((f) => !f.calculated || f.stored)
|
|
1680
1693
|
.map((f) => `,"${(0, internal_1.sqlsanitize)(f.name)}" ${f.sql_bare_type}`);
|
|
@@ -1689,6 +1702,7 @@ class Table {
|
|
|
1689
1702
|
_restore_of_version integer,
|
|
1690
1703
|
_userid integer
|
|
1691
1704
|
${flds.join("")}
|
|
1705
|
+
${this.name === "users" ? ",_attributes JSONB" : ""}
|
|
1692
1706
|
,PRIMARY KEY("${pk}", _version)
|
|
1693
1707
|
);`);
|
|
1694
1708
|
}
|
|
@@ -2221,7 +2235,8 @@ class Table {
|
|
|
2221
2235
|
});
|
|
2222
2236
|
}
|
|
2223
2237
|
catch (e) {
|
|
2224
|
-
|
|
2238
|
+
if (!(e?.message || "").includes("current transaction is aborted, commands ignored until end of transaction"))
|
|
2239
|
+
rejectDetails += `Reject row ${i} because: ${e?.message}\n`;
|
|
2225
2240
|
rejects += 1;
|
|
2226
2241
|
}
|
|
2227
2242
|
}
|
|
@@ -2264,7 +2279,8 @@ class Table {
|
|
|
2264
2279
|
}
|
|
2265
2280
|
catch (e) {
|
|
2266
2281
|
return {
|
|
2267
|
-
error: `Error processing CSV file: ${!e ? e : e.error || e.message || e}
|
|
2282
|
+
error: `Error processing CSV file: ${!e ? e : e.error || e.message || e}
|
|
2283
|
+
${rejectDetails}`,
|
|
2268
2284
|
};
|
|
2269
2285
|
}
|
|
2270
2286
|
if (rejectDetails)
|
|
@@ -2750,7 +2766,7 @@ class Table {
|
|
|
2750
2766
|
offset: opts.offset,
|
|
2751
2767
|
});
|
|
2752
2768
|
const sql = `SELECT ${fldNms.join()} FROM ${schema}"${(0, internal_1.sqlsanitize)(this.name)}" a ${joinq} ${where} ${(0, internal_1.mkSelectOptions)(selectopts, values, db_1.default.is_sqlite)}`;
|
|
2753
|
-
return { sql, values, joinFields };
|
|
2769
|
+
return { sql, values, joinFields, aggregations };
|
|
2754
2770
|
}
|
|
2755
2771
|
/**
|
|
2756
2772
|
* @param {object} [opts = {}]
|
|
@@ -2800,13 +2816,25 @@ class Table {
|
|
|
2800
2816
|
const fields = this.fields;
|
|
2801
2817
|
const { forUser, forPublic, ...selopts1 } = opts;
|
|
2802
2818
|
const role = forUser ? forUser.role_id : forPublic ? 100 : null;
|
|
2803
|
-
const { sql, values, notAuthorized, joinFields } = await this.getJoinedQuery(opts);
|
|
2819
|
+
const { sql, values, notAuthorized, joinFields, aggregations } = await this.getJoinedQuery(opts);
|
|
2804
2820
|
if (notAuthorized)
|
|
2805
2821
|
return [];
|
|
2806
2822
|
const res = await db_1.default.query(sql, values);
|
|
2807
2823
|
if (res.length === 0)
|
|
2808
2824
|
return res; // check
|
|
2809
2825
|
let calcRow = apply_calculated_fields(res.rows.map((row) => this.parse_json_fields(row)), fields, !!opts?.ignore_errors);
|
|
2826
|
+
//need to json parse array agg values on sqlite
|
|
2827
|
+
if (db_1.default.isSQLite &&
|
|
2828
|
+
Object.values(aggregations || {}).some((agg) => agg.aggregate.toLowerCase() === "array_agg")) {
|
|
2829
|
+
Object.entries(aggregations || {}).forEach(([k, agg]) => {
|
|
2830
|
+
if (agg.aggregate.toLowerCase() === "array_agg") {
|
|
2831
|
+
calcRow.forEach((row) => {
|
|
2832
|
+
if (row[k])
|
|
2833
|
+
row[k] = JSON.parse(row[k]);
|
|
2834
|
+
});
|
|
2835
|
+
}
|
|
2836
|
+
});
|
|
2837
|
+
}
|
|
2810
2838
|
//rename joinfields
|
|
2811
2839
|
if (Object.values(joinFields || {}).some((jf) => jf.rename_object)) {
|
|
2812
2840
|
let f = (x) => x;
|