@saltcorn/data 0.7.3 → 0.7.4-beta.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.map +1 -1
- package/dist/base-plugin/actions.js +6 -3
- package/dist/base-plugin/actions.js.map +1 -1
- package/dist/base-plugin/index.d.ts +172 -171
- 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 +26 -2
- package/dist/base-plugin/types.js.map +1 -1
- package/dist/base-plugin/viewtemplates/edit.d.ts +2 -2
- package/dist/base-plugin/viewtemplates/edit.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/edit.js +82 -13
- package/dist/base-plugin/viewtemplates/edit.js.map +1 -1
- package/dist/base-plugin/viewtemplates/filter.d.ts +2 -1
- package/dist/base-plugin/viewtemplates/filter.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/filter.js +31 -3
- package/dist/base-plugin/viewtemplates/filter.js.map +1 -1
- package/dist/base-plugin/viewtemplates/list.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/list.js +14 -5
- package/dist/base-plugin/viewtemplates/list.js.map +1 -1
- package/dist/base-plugin/viewtemplates/room.js +4 -2
- package/dist/base-plugin/viewtemplates/room.js.map +1 -1
- package/dist/base-plugin/viewtemplates/show.d.ts +1 -1
- package/dist/base-plugin/viewtemplates/show.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/show.js +34 -17
- package/dist/base-plugin/viewtemplates/show.js.map +1 -1
- package/dist/base-plugin/viewtemplates/viewable_fields.d.ts +6 -5
- package/dist/base-plugin/viewtemplates/viewable_fields.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/viewable_fields.js +20 -22
- package/dist/base-plugin/viewtemplates/viewable_fields.js.map +1 -1
- package/dist/coverage/lcov-report/block-navigation.d.ts +2 -0
- package/dist/coverage/lcov-report/block-navigation.d.ts.map +1 -0
- package/dist/coverage/lcov-report/block-navigation.js +71 -0
- package/dist/coverage/lcov-report/block-navigation.js.map +1 -0
- package/dist/coverage/lcov-report/prettify.d.ts +1 -0
- package/dist/coverage/lcov-report/prettify.d.ts.map +1 -0
- package/dist/coverage/lcov-report/prettify.js +478 -0
- package/dist/coverage/lcov-report/prettify.js.map +1 -0
- package/dist/coverage/lcov-report/sorter.d.ts +2 -0
- package/dist/coverage/lcov-report/sorter.d.ts.map +1 -0
- package/dist/coverage/lcov-report/sorter.js +164 -0
- package/dist/coverage/lcov-report/sorter.js.map +1 -0
- package/dist/db/connect_mobile.d.ts +0 -1
- package/dist/db/connect_mobile.d.ts.map +1 -1
- package/dist/db/connect_mobile.js +0 -1
- package/dist/db/connect_mobile.js.map +1 -1
- package/dist/db/db.test.d.ts +2 -0
- package/dist/db/db.test.d.ts.map +1 -0
- package/dist/db/db.test.js +28 -0
- package/dist/db/db.test.js.map +1 -0
- package/dist/db/fixtures.js +3 -3
- package/dist/db/fixtures.js.map +1 -1
- package/dist/db/state.d.ts +4 -5
- package/dist/db/state.d.ts.map +1 -1
- package/dist/db/state.js +28 -4
- package/dist/db/state.js.map +1 -1
- package/dist/migrations/202207252150.d.ts +3 -0
- package/dist/migrations/202207252150.d.ts.map +1 -0
- package/dist/migrations/202207252150.js +13 -0
- package/dist/migrations/202207252150.js.map +1 -0
- package/dist/migrations/202207261221.d.ts +2 -0
- package/dist/migrations/202207261221.d.ts.map +1 -0
- package/dist/migrations/202207261221.js +6 -0
- package/dist/migrations/202207261221.js.map +1 -0
- package/dist/migrations/202208101144.d.ts +3 -0
- package/dist/migrations/202208101144.d.ts.map +1 -0
- package/dist/migrations/202208101144.js +32 -0
- package/dist/migrations/202208101144.js.map +1 -0
- package/dist/models/config.d.ts.map +1 -1
- package/dist/models/config.js +41 -0
- package/dist/models/config.js.map +1 -1
- package/dist/models/crash.d.ts.map +1 -1
- package/dist/models/crash.js +2 -0
- package/dist/models/crash.js.map +1 -1
- package/dist/models/email.d.ts +1 -1
- package/dist/models/email.js +1 -2
- package/dist/models/email.js.map +1 -1
- package/dist/models/expression.js +1 -1
- package/dist/models/expression.js.map +1 -1
- package/dist/models/field.d.ts.map +1 -1
- package/dist/models/field.js +1 -0
- package/dist/models/field.js.map +1 -1
- package/dist/models/file.d.ts +2 -2
- package/dist/models/file.d.ts.map +1 -1
- package/dist/models/file.js +3 -1
- package/dist/models/file.js.map +1 -1
- package/dist/models/index.d.ts +1 -1
- package/dist/models/index.d.ts.map +1 -1
- 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/scheduler.d.ts +1 -1
- package/dist/models/scheduler.d.ts.map +1 -1
- package/dist/models/scheduler.js +8 -2
- 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 +16 -8
- package/dist/models/table.js.map +1 -1
- package/dist/models/tag.d.ts +47 -0
- package/dist/models/tag.d.ts.map +1 -0
- package/dist/models/tag.js +124 -0
- package/dist/models/tag.js.map +1 -0
- package/dist/models/tag_entry.d.ts +29 -0
- package/dist/models/tag_entry.d.ts.map +1 -0
- package/dist/models/tag_entry.js +48 -0
- package/dist/models/tag_entry.js.map +1 -0
- package/dist/models/trigger.d.ts.map +1 -1
- package/dist/models/trigger.js +21 -4
- package/dist/models/trigger.js.map +1 -1
- package/dist/models/user.d.ts +9 -2
- package/dist/models/user.d.ts.map +1 -1
- package/dist/models/user.js +68 -18
- package/dist/models/user.js.map +1 -1
- package/dist/models/view.d.ts.map +1 -1
- package/dist/models/view.js +26 -12
- package/dist/models/view.js.map +1 -1
- package/dist/package.json +120 -0
- package/dist/plugin-helper.d.ts.map +1 -1
- package/dist/plugin-helper.js +32 -13
- package/dist/plugin-helper.js.map +1 -1
- package/dist/tests/auxtest.test.js +19 -1
- package/dist/tests/auxtest.test.js.map +1 -1
- package/dist/tests/exact_views.test.js +84 -10
- package/dist/tests/exact_views.test.js.map +1 -1
- package/dist/tests/mocks.d.ts +3 -1
- package/dist/tests/mocks.d.ts.map +1 -1
- package/dist/tests/mocks.js +13 -1
- package/dist/tests/mocks.js.map +1 -1
- package/dist/tests/tag.test.d.ts +2 -0
- package/dist/tests/tag.test.d.ts.map +1 -0
- package/dist/tests/tag.test.js +97 -0
- package/dist/tests/tag.test.js.map +1 -0
- package/dist/tests/view.test.js +96 -0
- package/dist/tests/view.test.js.map +1 -1
- package/dist/tsconfig.json +24 -0
- package/dist/tsconfig.ref.json +9 -0
- package/package.json +7 -7
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import type { Row, Where, SelectOptions } from "@saltcorn/db-common/internal";
|
|
2
|
+
declare class TagEntry {
|
|
3
|
+
id?: number;
|
|
4
|
+
tagId?: number;
|
|
5
|
+
table_id?: number;
|
|
6
|
+
view_id?: number;
|
|
7
|
+
page_id?: number;
|
|
8
|
+
trigger_id?: number;
|
|
9
|
+
constructor(o: TagEntryCfg | TagEntry);
|
|
10
|
+
static find(where?: Where, selectopts?: SelectOptions): Promise<Array<TagEntry>>;
|
|
11
|
+
static findOne(where: Where): Promise<TagEntry>;
|
|
12
|
+
static create(cfg: TagEntryCfg): Promise<TagEntry>;
|
|
13
|
+
static update(id: number, row: Row): Promise<void>;
|
|
14
|
+
delete(): Promise<void>;
|
|
15
|
+
isEmpty(): boolean;
|
|
16
|
+
}
|
|
17
|
+
declare namespace TagEntry {
|
|
18
|
+
type TagEntryCfg = {
|
|
19
|
+
id?: number;
|
|
20
|
+
tagId?: number;
|
|
21
|
+
table_id?: number;
|
|
22
|
+
view_id?: number;
|
|
23
|
+
page_id?: number;
|
|
24
|
+
trigger_id?: number;
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
declare type TagEntryCfg = TagEntry.TagEntryCfg;
|
|
28
|
+
export = TagEntry;
|
|
29
|
+
//# sourceMappingURL=tag_entry.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tag_entry.d.ts","sourceRoot":"","sources":["../../models/tag_entry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAG9E,cAAM,QAAQ;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;gBAER,CAAC,EAAE,WAAW,GAAG,QAAQ;WASxB,IAAI,CACf,KAAK,CAAC,EAAE,KAAK,EACb,UAAU,GAAE,aAAkB,GAC7B,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;WAMd,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;WASxC,MAAM,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;WAa3C,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,OAAO,IAAI,OAAO;CAGnB;AAED,kBAAU,QAAQ,CAAC;IACjB,KAAY,WAAW,GAAG;QACxB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AACD,aAAK,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;AAExC,SAAS,QAAQ,CAAC"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
const db_1 = __importDefault(require("../db"));
|
|
6
|
+
class TagEntry {
|
|
7
|
+
constructor(o) {
|
|
8
|
+
this.id = o.id;
|
|
9
|
+
this.tagId = o.tagId;
|
|
10
|
+
this.table_id = o.table_id;
|
|
11
|
+
this.view_id = o.view_id;
|
|
12
|
+
this.page_id = o.page_id;
|
|
13
|
+
this.trigger_id = o.trigger_id;
|
|
14
|
+
}
|
|
15
|
+
static async find(where, selectopts = {}) {
|
|
16
|
+
// TODO cache
|
|
17
|
+
const entries = await db_1.default.select("_sc_tag_entries", where, selectopts);
|
|
18
|
+
return entries.map((entry) => new TagEntry(entry));
|
|
19
|
+
}
|
|
20
|
+
static async findOne(where) {
|
|
21
|
+
// TODO cache
|
|
22
|
+
const entry = await db_1.default.selectMaybeOne("_sc_tag_entries", where);
|
|
23
|
+
return entry ? new TagEntry(entry) : entry;
|
|
24
|
+
}
|
|
25
|
+
static async create(cfg) {
|
|
26
|
+
const entry = new TagEntry(cfg);
|
|
27
|
+
const eid = await db_1.default.insert("_sc_tag_entries", {
|
|
28
|
+
tag_id: cfg.tagId,
|
|
29
|
+
table_id: cfg.table_id,
|
|
30
|
+
view_id: cfg.view_id,
|
|
31
|
+
page_id: cfg.page_id,
|
|
32
|
+
trigger_id: cfg.trigger_id,
|
|
33
|
+
});
|
|
34
|
+
entry.id = eid;
|
|
35
|
+
return entry;
|
|
36
|
+
}
|
|
37
|
+
static async update(id, row) {
|
|
38
|
+
await db_1.default.update("_sc_tag_entries", row, id);
|
|
39
|
+
}
|
|
40
|
+
async delete() {
|
|
41
|
+
await db_1.default.deleteWhere("_sc_tag_entries", { id: this.id });
|
|
42
|
+
}
|
|
43
|
+
isEmpty() {
|
|
44
|
+
return !this.table_id && !this.view_id && !this.page_id && !this.trigger_id;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
module.exports = TagEntry;
|
|
48
|
+
//# sourceMappingURL=tag_entry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tag_entry.js","sourceRoot":"","sources":["../../models/tag_entry.ts"],"names":[],"mappings":";;;;AACA,+CAAuB;AAEvB,MAAM,QAAQ;IAQZ,YAAY,CAAyB;QACnC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,KAAa,EACb,aAA4B,EAAE;QAE9B,aAAa;QACb,MAAM,OAAO,GAAG,MAAM,YAAE,CAAC,MAAM,CAAC,iBAAiB,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACtE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,KAAkB,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAY;QAC/B,aAAa;QACb,MAAM,KAAK,GAAgB,MAAM,YAAE,CAAC,cAAc,CAChD,iBAAiB,EACjB,KAAK,CACN,CAAC;QACF,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAgB;QAClC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,GAAG,GAAG,MAAM,YAAE,CAAC,MAAM,CAAC,iBAAiB,EAAE;YAC7C,MAAM,EAAE,GAAG,CAAC,KAAK;YACjB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,UAAU,EAAE,GAAG,CAAC,UAAU;SAC3B,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,GAAG,GAAG,CAAC;QACf,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,GAAQ;QACtC,MAAM,YAAE,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,MAAM;QACV,MAAM,YAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO;QACL,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9E,CAAC;CACF;AAcD,iBAAS,QAAQ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trigger.d.ts","sourceRoot":"","sources":["../../models/trigger.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EAChB,MAAM,kDAAkD,CAAC;
|
|
1
|
+
{"version":3,"file":"trigger.d.ts","sourceRoot":"","sources":["../../models/trigger.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EAChB,MAAM,kDAAkD,CAAC;AAK1D;;;GAGG;AACH,cAAM,OAAQ,YAAW,eAAe;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,aAAa,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;IAE5B;;;OAGG;gBACS,CAAC,EAAE,UAAU;IAoBzB;;;OAGG;IACH,IAAI,MAAM,IAAI,GAAG,CAiBhB;IAED;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,EAAE;IAKpC;;;;;OAKG;WACU,MAAM,CACjB,KAAK,CAAC,EAAE,KAAK,EACb,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,OAAO,EAAE,CAAC;IAKrB;;;OAGG;WACU,oBAAoB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IASvD;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK;IAO3B;;;;;OAKG;WACU,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD;;;;OAIG;WACU,MAAM,CAAC,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAapD;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;;;;OAMG;IACH,MAAM,CAAC,SAAS,CACd,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,MAAM,GAAG,IAAW,EAC7B,MAAM,KAAK,EACX,OAAO,CAAC,EAAE,GAAG,GACZ,IAAI;IA0CP;;;;;;OAMG;WACU,gBAAgB,CAC3B,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,GAAG,GACP,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;OAIG;IACG,aAAa,CAAC,OAAO,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC;IAenD;;;;;OAKG;WACU,gBAAgB,CAC3B,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,OAAO,EAAE,CAAC;IAuBrB;;;OAGG;IACH,MAAM,KAAK,YAAY,IAAI,MAAM,EAAE,CAoBlC;CACF;AAGD,SAAS,OAAO,CAAC"}
|
package/dist/models/trigger.js
CHANGED
|
@@ -10,6 +10,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
10
10
|
};
|
|
11
11
|
const db = require("../db");
|
|
12
12
|
const eventlog_1 = __importDefault(require("./eventlog"));
|
|
13
|
+
const Crash = require("./crash");
|
|
13
14
|
const { satisfies } = require("../utils");
|
|
14
15
|
/**
|
|
15
16
|
* Trigger class
|
|
@@ -147,6 +148,8 @@ class Trigger {
|
|
|
147
148
|
const { password, ...user } = userPW || {};
|
|
148
149
|
const { getState } = require("../db/state");
|
|
149
150
|
const findArgs = { when_trigger: eventType };
|
|
151
|
+
const state = getState();
|
|
152
|
+
state.log(5, `Event ${eventType} ${channel} ${JSON.stringify(payload)}`);
|
|
150
153
|
let table;
|
|
151
154
|
if (channel && ["Insert", "Update", "Delete"].includes(channel)) {
|
|
152
155
|
const Table = require("./table");
|
|
@@ -157,7 +160,8 @@ class Trigger {
|
|
|
157
160
|
findArgs.channel = channel;
|
|
158
161
|
const triggers = Trigger.find(findArgs);
|
|
159
162
|
for (const trigger of triggers) {
|
|
160
|
-
|
|
163
|
+
state.log(4, `Trigger run ${trigger.name} ${trigger.action} `);
|
|
164
|
+
const action = state.actions[trigger.action];
|
|
161
165
|
action &&
|
|
162
166
|
action.run &&
|
|
163
167
|
(await action.run({
|
|
@@ -174,7 +178,7 @@ class Trigger {
|
|
|
174
178
|
event_type: eventType,
|
|
175
179
|
channel,
|
|
176
180
|
user_id: (userPW || {}).id || null,
|
|
177
|
-
payload,
|
|
181
|
+
payload: typeof payload === "string" ? { text: payload } : payload,
|
|
178
182
|
occur_at: new Date(),
|
|
179
183
|
});
|
|
180
184
|
}, 0);
|
|
@@ -188,8 +192,19 @@ class Trigger {
|
|
|
188
192
|
*/
|
|
189
193
|
static async runTableTriggers(when_trigger, table, row) {
|
|
190
194
|
const triggers = await Trigger.getTableTriggers(when_trigger, table);
|
|
195
|
+
const { getState } = require("../db/state");
|
|
196
|
+
const state = getState();
|
|
191
197
|
for (const trigger of triggers) {
|
|
192
|
-
|
|
198
|
+
state.log(4, `Trigger run ${trigger.name} ${trigger.action} on ${when_trigger} ${table.name} id=${row?.id}`);
|
|
199
|
+
try {
|
|
200
|
+
await trigger.run(row); // getTableTriggers ensures run is set
|
|
201
|
+
}
|
|
202
|
+
catch (e) {
|
|
203
|
+
Crash.create(e, {
|
|
204
|
+
url: "/",
|
|
205
|
+
headers: { when_trigger, table: table.name, trigger: trigger.name },
|
|
206
|
+
});
|
|
207
|
+
}
|
|
193
208
|
}
|
|
194
209
|
//intentionally omit await
|
|
195
210
|
eventlog_1.default.create({
|
|
@@ -207,7 +222,9 @@ class Trigger {
|
|
|
207
222
|
*/
|
|
208
223
|
async runWithoutRow(runargs = {}) {
|
|
209
224
|
const { getState } = require("../db/state");
|
|
210
|
-
const
|
|
225
|
+
const state = getState();
|
|
226
|
+
state.log(4, `Trigger run ${this.name} ${this.action} no row`);
|
|
227
|
+
const action = state.actions[this.action];
|
|
211
228
|
return (action &&
|
|
212
229
|
action.run &&
|
|
213
230
|
action.run({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../models/trigger.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAEH,4BAA6B;AAC7B,0DAAkC;
|
|
1
|
+
{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../models/trigger.ts"],"names":[],"mappings":"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"}
|
package/dist/models/user.d.ts
CHANGED
|
@@ -17,7 +17,7 @@ declare class User {
|
|
|
17
17
|
reset_password_token?: string | null;
|
|
18
18
|
reset_password_expiry?: Date | null;
|
|
19
19
|
role_id: number;
|
|
20
|
-
last_mobile_login?: Date;
|
|
20
|
+
last_mobile_login?: Date | null;
|
|
21
21
|
[key: string]: any;
|
|
22
22
|
/**
|
|
23
23
|
* User constructor
|
|
@@ -68,6 +68,13 @@ declare class User {
|
|
|
68
68
|
* @returns {Promise<boolean|User>}
|
|
69
69
|
*/
|
|
70
70
|
static authenticate(uo: any): Promise<User | false>;
|
|
71
|
+
/**
|
|
72
|
+
* Find users list
|
|
73
|
+
* @param where - where object
|
|
74
|
+
* @param selectopts - select options
|
|
75
|
+
* @returns {Promise<User[]>}
|
|
76
|
+
*/
|
|
77
|
+
static findForSession(where: Where): Promise<User | false>;
|
|
71
78
|
/**
|
|
72
79
|
* Find users list
|
|
73
80
|
* @param where - where object
|
|
@@ -201,7 +208,7 @@ declare namespace User {
|
|
|
201
208
|
role_id?: number | string;
|
|
202
209
|
reset_password_token?: string;
|
|
203
210
|
reset_password_expiry?: Date | number | string;
|
|
204
|
-
last_mobile_login?: Date;
|
|
211
|
+
last_mobile_login?: Date | number | string;
|
|
205
212
|
[key: string]: any;
|
|
206
213
|
};
|
|
207
214
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../models/user.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,EACV,YAAY,EACZ,MAAM,EACN,cAAc,EACf,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../models/user.ts"],"names":[],"mappings":"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"}
|
package/dist/models/user.js
CHANGED
|
@@ -24,6 +24,19 @@ const safeUserFields = (o) => {
|
|
|
24
24
|
const { email, password, language, _attributes, api_token, verification_token, verified_on, disabled, id, reset_password_token, reset_password_expiry, role_id, ...rest } = o;
|
|
25
25
|
return rest;
|
|
26
26
|
};
|
|
27
|
+
/**
|
|
28
|
+
* prepare a Date for the user object
|
|
29
|
+
* @param date date in different formats
|
|
30
|
+
* @returns
|
|
31
|
+
*/
|
|
32
|
+
const convertDateParam = (date) => {
|
|
33
|
+
return (typeof date === "string" && date.length > 0) ||
|
|
34
|
+
typeof date === "number"
|
|
35
|
+
? new Date(date)
|
|
36
|
+
: date instanceof Date
|
|
37
|
+
? date
|
|
38
|
+
: null;
|
|
39
|
+
};
|
|
27
40
|
/**
|
|
28
41
|
* User
|
|
29
42
|
* @category saltcorn-data
|
|
@@ -51,16 +64,9 @@ class User {
|
|
|
51
64
|
if (o.id)
|
|
52
65
|
this.id = +o.id;
|
|
53
66
|
this.reset_password_token = o.reset_password_token || null;
|
|
54
|
-
this.reset_password_expiry =
|
|
55
|
-
(typeof o.reset_password_expiry === "string" &&
|
|
56
|
-
o.reset_password_expiry.length > 0) ||
|
|
57
|
-
typeof o.reset_password_expiry === "number"
|
|
58
|
-
? new Date(o.reset_password_expiry)
|
|
59
|
-
: o.reset_password_expiry instanceof Date
|
|
60
|
-
? o.reset_password_expiry
|
|
61
|
-
: null;
|
|
67
|
+
this.reset_password_expiry = convertDateParam(o.reset_password_expiry);
|
|
62
68
|
this.role_id = o.role_id ? +o.role_id : 8;
|
|
63
|
-
this.last_mobile_login = o.last_mobile_login;
|
|
69
|
+
this.last_mobile_login = convertDateParam(o.last_mobile_login);
|
|
64
70
|
Object.assign(this, safeUserFields(o));
|
|
65
71
|
}
|
|
66
72
|
/**
|
|
@@ -91,7 +97,7 @@ class User {
|
|
|
91
97
|
const upd = { password };
|
|
92
98
|
if (expireToken)
|
|
93
99
|
upd.reset_password_token = null;
|
|
94
|
-
await
|
|
100
|
+
await this.update(upd);
|
|
95
101
|
}
|
|
96
102
|
/**
|
|
97
103
|
* Find or Create User
|
|
@@ -175,10 +181,9 @@ class User {
|
|
|
175
181
|
*/
|
|
176
182
|
static async authenticate(uo) {
|
|
177
183
|
const { password, ...uoSearch } = uo;
|
|
178
|
-
const
|
|
179
|
-
if (
|
|
184
|
+
const urow = await User.findForSession(uoSearch);
|
|
185
|
+
if (!urow)
|
|
180
186
|
return false;
|
|
181
|
-
const [urow] = urows;
|
|
182
187
|
if (urow.disabled)
|
|
183
188
|
return false;
|
|
184
189
|
const cmp = urow.checkPassword(password || "");
|
|
@@ -187,6 +192,48 @@ class User {
|
|
|
187
192
|
else
|
|
188
193
|
return false;
|
|
189
194
|
}
|
|
195
|
+
/**
|
|
196
|
+
* Find users list
|
|
197
|
+
* @param where - where object
|
|
198
|
+
* @param selectopts - select options
|
|
199
|
+
* @returns {Promise<User[]>}
|
|
200
|
+
*/
|
|
201
|
+
static async findForSession(where) {
|
|
202
|
+
//get join fields in all ownership formulae
|
|
203
|
+
const { getState } = require("../db/state");
|
|
204
|
+
const { freeVariables } = require("./expression");
|
|
205
|
+
const Field = require("./field");
|
|
206
|
+
const { add_free_variables_to_joinfields } = require("../plugin-helper");
|
|
207
|
+
let freeVars = new Set();
|
|
208
|
+
for (const table of getState().tables)
|
|
209
|
+
if (table.ownership_formula)
|
|
210
|
+
freeVars = new Set([
|
|
211
|
+
...freeVars,
|
|
212
|
+
...freeVariables(table.ownership_formula),
|
|
213
|
+
]);
|
|
214
|
+
const freeUserVars = [...freeVars]
|
|
215
|
+
.map((fv) => {
|
|
216
|
+
const [kpath0, ...rest] = fv.split(".");
|
|
217
|
+
if (kpath0 === "user" && rest.length > 0)
|
|
218
|
+
return rest.join(".");
|
|
219
|
+
else
|
|
220
|
+
return null;
|
|
221
|
+
})
|
|
222
|
+
.filter((s) => s);
|
|
223
|
+
const user_table = table_1.default.findOne({ name: "users" });
|
|
224
|
+
const fields = await user_table?.getFields();
|
|
225
|
+
const joinFields = {};
|
|
226
|
+
add_free_variables_to_joinfields(new Set(freeUserVars), joinFields, fields);
|
|
227
|
+
const us = await user_table.getJoinedRows({
|
|
228
|
+
where,
|
|
229
|
+
limit: 2,
|
|
230
|
+
joinFields,
|
|
231
|
+
starFields: true,
|
|
232
|
+
});
|
|
233
|
+
if (us.length !== 1)
|
|
234
|
+
return false;
|
|
235
|
+
return new User(us[0]);
|
|
236
|
+
}
|
|
190
237
|
/**
|
|
191
238
|
* Find users list
|
|
192
239
|
* @param where - where object
|
|
@@ -223,6 +270,7 @@ class User {
|
|
|
223
270
|
const schema = db_1.default.getTenantSchemaPrefix();
|
|
224
271
|
await this.destroy_sessions();
|
|
225
272
|
await db_1.default.query(`delete FROM ${schema}users WHERE id = $1`, [this.id]);
|
|
273
|
+
await trigger_1.default.runTableTriggers("Delete", table_1.default.findOne({ name: "users" }), this);
|
|
226
274
|
}
|
|
227
275
|
/**
|
|
228
276
|
* Set language for User in database
|
|
@@ -239,6 +287,8 @@ class User {
|
|
|
239
287
|
*/
|
|
240
288
|
async update(row) {
|
|
241
289
|
await db_1.default.update("users", row, this.id);
|
|
290
|
+
Object.assign(this, row);
|
|
291
|
+
await trigger_1.default.runTableTriggers("Update", table_1.default.findOne({ name: "users" }), { ...this, ...row });
|
|
242
292
|
}
|
|
243
293
|
/**
|
|
244
294
|
* Get new reset token
|
|
@@ -249,7 +299,7 @@ class User {
|
|
|
249
299
|
const reset_password_expiry = new Date();
|
|
250
300
|
reset_password_expiry.setDate(new Date().getDate() + 1);
|
|
251
301
|
const reset_password_token = await (0, bcryptjs_1.hash)(reset_password_token_uuid, 10);
|
|
252
|
-
await
|
|
302
|
+
await this.update({ reset_password_token, reset_password_expiry });
|
|
253
303
|
return reset_password_token_uuid;
|
|
254
304
|
}
|
|
255
305
|
/**
|
|
@@ -258,7 +308,7 @@ class User {
|
|
|
258
308
|
*/
|
|
259
309
|
async getNewAPIToken() {
|
|
260
310
|
const api_token = (0, uuid_1.v4)();
|
|
261
|
-
await
|
|
311
|
+
await this.update({ api_token });
|
|
262
312
|
this.api_token = api_token;
|
|
263
313
|
return api_token;
|
|
264
314
|
}
|
|
@@ -268,7 +318,7 @@ class User {
|
|
|
268
318
|
*/
|
|
269
319
|
async removeAPIToken() {
|
|
270
320
|
const api_token = null;
|
|
271
|
-
await
|
|
321
|
+
await this.update({ api_token });
|
|
272
322
|
this.api_token = api_token;
|
|
273
323
|
return api_token;
|
|
274
324
|
}
|
|
@@ -315,7 +365,7 @@ class User {
|
|
|
315
365
|
const elevate_verified = +getState().getConfig("elevate_verified");
|
|
316
366
|
if (elevate_verified)
|
|
317
367
|
upd.role_id = Math.min(elevate_verified, this.role_id);
|
|
318
|
-
await
|
|
368
|
+
await this.update(upd);
|
|
319
369
|
Object.assign(this, upd);
|
|
320
370
|
const Trigger = require("./trigger");
|
|
321
371
|
Trigger.emitEvent("UserVerified", null, this, this);
|
|
@@ -414,7 +464,7 @@ class User {
|
|
|
414
464
|
: db_1.default.isSQLite
|
|
415
465
|
? date.valueOf()
|
|
416
466
|
: date.toISOString();
|
|
417
|
-
await
|
|
467
|
+
await this.update({ last_mobile_login: dateVal });
|
|
418
468
|
}
|
|
419
469
|
}
|
|
420
470
|
module.exports = User;
|
package/dist/models/user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../models/user.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../models/user.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../models/view.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../models/view.ts"],"names":[],"mappings":"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"}
|
package/dist/models/view.js
CHANGED
|
@@ -333,19 +333,31 @@ class View {
|
|
|
333
333
|
const { getState } = require("../db/state");
|
|
334
334
|
const base_url = getState().getConfig("base_url") || "http://10.0.2.2:3000"; //TODO default from req
|
|
335
335
|
const queries = {};
|
|
336
|
-
//const vtQueries = queryObj;
|
|
337
336
|
Object.entries(queryObj).forEach(([k, v]) => {
|
|
338
337
|
queries[k] = async (...args) => {
|
|
339
338
|
const url = `${base_url}/api/viewQuery/${this.name}/${k}`;
|
|
339
|
+
const headers = {
|
|
340
|
+
"X-Requested-With": "XMLHttpRequest",
|
|
341
|
+
"X-Saltcorn-Client": "mobile-app",
|
|
342
|
+
};
|
|
340
343
|
const token = window.localStorage.getItem("auth_jwt");
|
|
341
|
-
|
|
342
|
-
headers
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
}
|
|
347
|
-
|
|
348
|
-
|
|
344
|
+
if (token)
|
|
345
|
+
headers.Authorization = `jwt ${token}`;
|
|
346
|
+
try {
|
|
347
|
+
let response = await axios_1.default.post(url, { args }, {
|
|
348
|
+
headers,
|
|
349
|
+
});
|
|
350
|
+
for (const { type, msg } of response.data.alerts)
|
|
351
|
+
req.flash(type, msg);
|
|
352
|
+
return response.data.success;
|
|
353
|
+
}
|
|
354
|
+
catch (error) {
|
|
355
|
+
if (error.request?.status === 401)
|
|
356
|
+
error.message = req.__("Not authorized");
|
|
357
|
+
else
|
|
358
|
+
error.message = `Unable to call POST ${url}:\n${error.message}`;
|
|
359
|
+
throw error;
|
|
360
|
+
}
|
|
349
361
|
};
|
|
350
362
|
});
|
|
351
363
|
return queries;
|
|
@@ -410,7 +422,7 @@ class View {
|
|
|
410
422
|
const fields = await tbl.getFields();
|
|
411
423
|
const qstate = await stateFieldsToWhere({ fields, state: query });
|
|
412
424
|
const rows = await tbl.getRows(qstate);
|
|
413
|
-
const rendered = await this.viewtemplateObj.renderRows(tbl, this.name, this.configuration, extraArgs, rows);
|
|
425
|
+
const rendered = await this.viewtemplateObj.renderRows(tbl, this.name, this.configuration, extraArgs, rows, query);
|
|
414
426
|
return rendered.map((html, ix) => ({
|
|
415
427
|
html,
|
|
416
428
|
row: rows[ix],
|
|
@@ -432,7 +444,8 @@ class View {
|
|
|
432
444
|
*/
|
|
433
445
|
async runPost(query, body, extraArgs, remote = !isNode()) {
|
|
434
446
|
const { getState } = require("../db/state");
|
|
435
|
-
if (getState().
|
|
447
|
+
if (!getState().mobileConfig ||
|
|
448
|
+
getState().mobileConfig.localTableIds.indexOf(this.table_id) >= 0) {
|
|
436
449
|
remote = false;
|
|
437
450
|
}
|
|
438
451
|
this.check_viewtemplate();
|
|
@@ -566,7 +579,8 @@ class View {
|
|
|
566
579
|
if (isNode() || !this.table_id)
|
|
567
580
|
return false;
|
|
568
581
|
const { getState } = require("../db/state");
|
|
569
|
-
return getState().
|
|
582
|
+
return (getState().mobileConfig &&
|
|
583
|
+
getState().mobileConfig.localTableIds.indexOf(this.table_id) < 0);
|
|
570
584
|
}
|
|
571
585
|
}
|
|
572
586
|
function typeWithDefinedMember(object, member) {
|