@saltcorn/data 1.3.0-beta.13 → 1.3.0-beta.15
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/viewtemplates/filter.d.ts.map +1 -1
- package/dist/base-plugin/viewtemplates/filter.js +9 -1
- package/dist/base-plugin/viewtemplates/filter.js.map +1 -1
- package/dist/models/config.d.ts.map +1 -1
- package/dist/models/config.js +60 -0
- package/dist/models/config.js.map +1 -1
- package/dist/models/expression.d.ts +1 -1
- package/dist/models/expression.d.ts.map +1 -1
- package/dist/models/expression.js +2 -1
- package/dist/models/expression.js.map +1 -1
- package/dist/models/form.d.ts.map +1 -1
- package/dist/models/form.js +2 -0
- package/dist/models/form.js.map +1 -1
- package/dist/models/notification.d.ts.map +1 -1
- package/dist/models/notification.js +37 -1
- package/dist/models/notification.js.map +1 -1
- package/dist/models/table_constraints.d.ts.map +1 -1
- package/dist/models/table_constraints.js +4 -1
- package/dist/models/table_constraints.js.map +1 -1
- package/dist/plugin-helper.d.ts.map +1 -1
- package/dist/plugin-helper.js +2 -0
- package/dist/plugin-helper.js.map +1 -1
- package/package.json +10 -8
package/dist/models/form.js
CHANGED
|
@@ -77,6 +77,8 @@ class Form {
|
|
|
77
77
|
const extraCtx = { ...this.values };
|
|
78
78
|
if (user && !extraCtx.user_id)
|
|
79
79
|
extraCtx.user_id = user.id;
|
|
80
|
+
if (user && !extraCtx.user)
|
|
81
|
+
extraCtx.user = user;
|
|
80
82
|
for (const f of this.fields) {
|
|
81
83
|
if (hasFieldMembers(f))
|
|
82
84
|
await f.fill_fkey_options(force_allow_none, undefined, extraCtx, optionsQuery, formFieldNames, this.values[f.name] || undefined, user);
|
package/dist/models/form.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form.js","sourceRoot":"","sources":["../../models/form.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"form.js","sourceRoot":"","sources":["../../models/form.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.d.ts","sourceRoot":"","sources":["../../models/notification.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,KAAK,EACL,aAAa,EAEb,WAAW,EACZ,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"notification.d.ts","sourceRoot":"","sources":["../../models/notification.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,KAAK,EACL,aAAa,EAEb,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAQtC;;;GAGG;AAEH,cAAM,YAAY;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,IAAI,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IAEd;;;OAGG;gBACS,CAAC,EAAE,eAAe,GAAG,YAAY;IAS7C;;;;OAIG;WACU,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,YAAY,EAAE,CAAC;IAK1B;;;OAGG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC;WAK5C,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAgEpD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;WAItB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;WAIhB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAI1C,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;CAGlD;AAED,KAAK,eAAe,GAAG,WAAW,CAAC,YAAY,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;AAEtE,SAAS,YAAY,CAAC"}
|
|
@@ -12,6 +12,7 @@ const db_1 = __importDefault(require("../db"));
|
|
|
12
12
|
const user_1 = __importDefault(require("./user"));
|
|
13
13
|
const state_1 = __importDefault(require("../db/state"));
|
|
14
14
|
const email_1 = __importDefault(require("./email"));
|
|
15
|
+
const web_push_1 = __importDefault(require("web-push"));
|
|
15
16
|
const { getState } = state_1.default;
|
|
16
17
|
/**
|
|
17
18
|
* Notification Class
|
|
@@ -65,13 +66,48 @@ class Notification {
|
|
|
65
66
|
to: user.email,
|
|
66
67
|
subject: o.title,
|
|
67
68
|
text: `${o.body}
|
|
68
|
-
|
|
69
|
+
${o.link}`,
|
|
69
70
|
html: `${o.body}<br/><a href="${o.link}">${o.link}</a>`,
|
|
70
71
|
};
|
|
71
72
|
(await email_1.default.getMailTransport())
|
|
72
73
|
.sendMail(email)
|
|
73
74
|
.catch((e) => getState()?.log(1, e.message));
|
|
74
75
|
}
|
|
76
|
+
if (user?._attributes?.notify_push) {
|
|
77
|
+
const state = getState();
|
|
78
|
+
if (state && user?.id) {
|
|
79
|
+
const icon = state.getConfig("push_notification_icon");
|
|
80
|
+
const badge = state.getConfig("push_notification_badge");
|
|
81
|
+
const publicKey = state.getConfig("vapid_public_key");
|
|
82
|
+
const privateKey = state.getConfig("vapid_private_key");
|
|
83
|
+
const email = state.getConfig("vapid_email");
|
|
84
|
+
if (!publicKey || !privateKey || !email) {
|
|
85
|
+
state.log(1, "Web push notifications are not configured properly. Missing VAPID keys or email.");
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
const subs = state.getConfig("push_notification_subscriptions", {})[user.id] || [];
|
|
89
|
+
for (const sub of subs) {
|
|
90
|
+
const payload = JSON.stringify({
|
|
91
|
+
title: o.title,
|
|
92
|
+
body: o.body,
|
|
93
|
+
icon: `/files/serve/${icon}`,
|
|
94
|
+
badge: `/files/serve/${badge}`,
|
|
95
|
+
});
|
|
96
|
+
try {
|
|
97
|
+
await web_push_1.default.sendNotification(sub, payload, {
|
|
98
|
+
vapidDetails: {
|
|
99
|
+
subject: `mailto:${email}`,
|
|
100
|
+
publicKey,
|
|
101
|
+
privateKey,
|
|
102
|
+
},
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
catch (error) {
|
|
106
|
+
state.log(1, `Error sending web push notification: ${error}`);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
75
111
|
}
|
|
76
112
|
async mark_as_read() {
|
|
77
113
|
await db_1.default.update("_sc_notifications", { read: true }, this.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../models/notification.ts"],"names":[],"mappings":";;;;AAAA;;;;;GAKG;AACH,+CAAuB;AAOvB,kDAA0B;AAC1B,wDAAgC;AAChC,oDAAkC;
|
|
1
|
+
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../models/notification.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table_constraints.d.ts","sourceRoot":"","sources":["../../models/table_constraints.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EACL,KAAK,KAAK,EACV,KAAK,aAAa,EAElB,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAIjC;;;GAGG;AACH,cAAM,eAAe;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,aAAa,EAAE,GAAG,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"table_constraints.d.ts","sourceRoot":"","sources":["../../models/table_constraints.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EACL,KAAK,KAAK,EACV,KAAK,aAAa,EAElB,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAIjC;;;GAGG;AACH,cAAM,eAAe;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,aAAa,EAAE,GAAG,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd;;OAEG;gBACS,CAAC,EAAE,kBAAkB;IAYjC;;OAEG;IACH,IAAI,MAAM,IAAI;QAAE,IAAI,EAAE,UAAU,CAAC;QAAC,aAAa,EAAE,GAAG,CAAA;KAAE,CAKrD;IAED;;;;OAIG;WACU,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAKlC;;;OAGG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAKnE;;;OAGG;WACU,MAAM,CAAC,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,eAAe,CAAC;IAkEpE;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAwB7B;;;;OAIG;WACU,wBAAwB,CACnC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC;IAUhB;;OAEG;IACH,MAAM,KAAK,YAAY,IAAI,KAAK,CAAC,UAAU,CAAC,CAE3C;CACF;AAGD,QAAA,MAAM,YAAY,yCAA0C,CAAC;AAC7D,KAAK,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhD,KAAK,kBAAkB,GAAG,WAAW,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AAE/D,SAAS,eAAe,CAAC"}
|
|
@@ -76,7 +76,10 @@ class TableConstraint {
|
|
|
76
76
|
await table.move_include_fts_to_search_context();
|
|
77
77
|
const text_fields = (0, internal_1.ftsFieldsSqlExpr)(table.fields, table.name, db_1.default.getTenantSchema());
|
|
78
78
|
const language = require("../db/state").getState().pg_ts_config;
|
|
79
|
-
|
|
79
|
+
const search_disable_fts = require("../db/state")
|
|
80
|
+
.getState()
|
|
81
|
+
.getConfig("search_disable_fts");
|
|
82
|
+
await db_1.default.add_fts_index(table.name, text_fields, language, search_disable_fts);
|
|
80
83
|
}
|
|
81
84
|
else if (con.type === "Index") {
|
|
82
85
|
await db_1.default.add_index(table.name, con.configuration.field);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table_constraints.js","sourceRoot":"","sources":["../../models/table_constraints.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"table_constraints.js","sourceRoot":"","sources":["../../models/table_constraints.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AAiyBA;;;;;;;;;GASG;AACH,wHARW,KAAK,GAAC,MAAM,GAMV,QAAQ,MAAM,EAAE,CAAC,CAymB7B;AAoLD;;;;;;;;GAQG;AACH,gDANW,MAAM,EAAE,UACR,KAAK,EAAE,sCAGL,MAAM,CA8NlB;AApTD;;;;;;;;;;;;;;;;;;;;;;;;;EA6EC;AAhLD;;;;;;;GAOG;AACH,uCALW,KAAK,GAAC,MAAM,YACZ,MAAM,sBAEJ,QAAQ,MAAM,EAAE,CAAC,CAoC7B;AAED;;;;;;GAMG;AACH,wCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;AAmfD;;;;;;;;;GASG;AACH;IAPyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACQ,MAAM;IACL,WAAW;IACd,KAAK,EAAjB,KAAK;IACH,MAAM,
|
|
1
|
+
{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AAiyBA;;;;;;;;;GASG;AACH,wHARW,KAAK,GAAC,MAAM,GAMV,QAAQ,MAAM,EAAE,CAAC,CAymB7B;AAoLD;;;;;;;;GAQG;AACH,gDANW,MAAM,EAAE,UACR,KAAK,EAAE,sCAGL,MAAM,CA8NlB;AApTD;;;;;;;;;;;;;;;;;;;;;;;;;EA6EC;AAhLD;;;;;;;GAOG;AACH,uCALW,KAAK,GAAC,MAAM,YACZ,MAAM,sBAEJ,QAAQ,MAAM,EAAE,CAAC,CAoC7B;AAED;;;;;;GAMG;AACH,wCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;AAmfD;;;;;;;;;GASG;AACH;IAPyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACQ,MAAM;IACL,WAAW;IACd,KAAK,EAAjB,KAAK;IACH,MAAM,CAsRlB;AA7bD;;;;;GAKG;AACH,2FAHW,MAAM,GACJ,MAAM,CAuElB;AAoXD;;;;;GAKG;AACH,iEAuHG;AAjrEH;;;;;;GAMG;AACH,2CALW,KAAK,EAAE,sCAGL,MAAM,CA+FlB;AAED;;;;;;GAMG;AACH,+EAkBC;AAgUD;;;;;GAKG;AACH,0CAJW,KAAK,GAAC,MAAM,YACZ,MAAM;oBACqB,MAAM,EAAE;GAqJ7C;AAsmDD;;;;;;GAMG;AACH,iCALW,MAAM,UACN,MAAM,EAAE,aAEN,MAAM,CA2ClB;AAED;;;;;;GAMG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CAiCrB;AA/yED;;;;GAIG;AACH,iFAFa,MAAM,CAoBlB;AA1ID;;;;;;;;;;;;;;;;GAgBG;AACH,gCAfW,MAAM,SACN,MAAM,oZAYJ,2FAAQ,CAkGpB;AAqnBD;;;;;GAKG;AACH,8CAJW,MAAM,SACN,MAAM,eACJ,QAAQ,MAAM,EAAE,CAAC,CASC;AAte/B;;;;;;GAMG;AACH,0CALW,KAAK,EAAE,mEAGL,QAAQ,MAAM,CAAC,CAwC3B;AAqgED;;;;GAIG;AAEH,kCAJW,MAAM,GACJ,MAAM,GAAC,SAAS,CAM5B;AAuOD;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CAwFtB;AAzOD;;;;;;GAMG;AACH,8EAHW,MAAM,EAAE,iBACN,MAAM,CAqIlB;;AA9oED;;;;;GAKG;AACH,kDAJW,KAAK,YACL,MAAM,8BAgDhB;AAED;;;;;;;GAOG;AACH,uDAJW,KAAK,YACL,MAAM;;;KAkChB;AAED;;;;;;;GAOG;AACH,uDANW,KAAK,YACL,MAAM,SACN,MAAM,QACN,MAAM,EAAE,OAuElB;AA4kED;;;;;;;;;;;;;;;;;;;;GAoCC;AAED;;;;GAIG;AACH;;cA+BC;AAjFD,mDAK+B"}
|
package/dist/plugin-helper.js
CHANGED
|
@@ -1759,11 +1759,13 @@ const stateFieldsToWhere = ({ fields, state, approximate = true, table, prefix =
|
|
|
1759
1759
|
const scState = getState();
|
|
1760
1760
|
const language = scState.pg_ts_config;
|
|
1761
1761
|
const use_websearch = scState.getConfig("search_use_websearch", false);
|
|
1762
|
+
const disable_fts = scState.getConfig("search_disable_fts", false);
|
|
1762
1763
|
qstate["_fts"] = {
|
|
1763
1764
|
searchTerm: v.replace(/\0/g, ""),
|
|
1764
1765
|
fields,
|
|
1765
1766
|
language,
|
|
1766
1767
|
use_websearch,
|
|
1768
|
+
disable_fts,
|
|
1767
1769
|
table: prefix
|
|
1768
1770
|
? prefix.replaceAll(".", "")
|
|
1769
1771
|
: table
|