@saltcorn/server 0.9.6-beta.10 → 0.9.6-beta.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +9 -9
- package/routes/fields.js +1 -1
- package/tests/fields.test.js +21 -0
package/package.json
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@saltcorn/server",
|
|
3
|
-
"version": "0.9.6-beta.
|
|
3
|
+
"version": "0.9.6-beta.11",
|
|
4
4
|
"description": "Server app for Saltcorn, open-source no-code platform",
|
|
5
5
|
"homepage": "https://saltcorn.com",
|
|
6
6
|
"main": "index.js",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"dependencies": {
|
|
9
9
|
"@aws-sdk/client-s3": "^3.451.0",
|
|
10
|
-
"@saltcorn/base-plugin": "0.9.6-beta.
|
|
11
|
-
"@saltcorn/builder": "0.9.6-beta.
|
|
12
|
-
"@saltcorn/data": "0.9.6-beta.
|
|
13
|
-
"@saltcorn/admin-models": "0.9.6-beta.
|
|
14
|
-
"@saltcorn/filemanager": "0.9.6-beta.
|
|
15
|
-
"@saltcorn/markup": "0.9.6-beta.
|
|
16
|
-
"@saltcorn/plugins-loader": "0.9.6-beta.
|
|
17
|
-
"@saltcorn/sbadmin2": "0.9.6-beta.
|
|
10
|
+
"@saltcorn/base-plugin": "0.9.6-beta.11",
|
|
11
|
+
"@saltcorn/builder": "0.9.6-beta.11",
|
|
12
|
+
"@saltcorn/data": "0.9.6-beta.11",
|
|
13
|
+
"@saltcorn/admin-models": "0.9.6-beta.11",
|
|
14
|
+
"@saltcorn/filemanager": "0.9.6-beta.11",
|
|
15
|
+
"@saltcorn/markup": "0.9.6-beta.11",
|
|
16
|
+
"@saltcorn/plugins-loader": "0.9.6-beta.11",
|
|
17
|
+
"@saltcorn/sbadmin2": "0.9.6-beta.11",
|
|
18
18
|
"@socket.io/cluster-adapter": "^0.2.1",
|
|
19
19
|
"@socket.io/sticky": "^1.0.1",
|
|
20
20
|
"adm-zip": "0.5.10",
|
package/routes/fields.js
CHANGED
|
@@ -1149,7 +1149,7 @@ router.post(
|
|
|
1149
1149
|
const jf = table.getField(ref);
|
|
1150
1150
|
const jtable = Table.findOne(jf.reftable_name);
|
|
1151
1151
|
const jrow = await jtable.getRow(
|
|
1152
|
-
{ [jtable.pk_name]: row[ref] },
|
|
1152
|
+
{ [jtable.pk_name]: row[ref]?.[jtable.pk_name] || row[ref] },
|
|
1153
1153
|
{ forUser: req.user, forPublic: !req.user }
|
|
1154
1154
|
);
|
|
1155
1155
|
row[ref] = jrow;
|
package/tests/fields.test.js
CHANGED
|
@@ -391,6 +391,27 @@ describe("Field Endpoints", () => {
|
|
|
391
391
|
})
|
|
392
392
|
.expect(toBeTrue((r) => +r.text > 2));
|
|
393
393
|
});
|
|
394
|
+
it("should show calculated field with two single joinfields", async () => {
|
|
395
|
+
const loginCookie = await getAdminLoginCookie();
|
|
396
|
+
const table = Table.findOne({ name: "patients" });
|
|
397
|
+
await Field.create({
|
|
398
|
+
table,
|
|
399
|
+
label: "pagesp12",
|
|
400
|
+
type: "Integer",
|
|
401
|
+
calculated: true,
|
|
402
|
+
stored: true,
|
|
403
|
+
expression: "favbook.pages+1+favbook.id",
|
|
404
|
+
});
|
|
405
|
+
const app = await getApp({ disableCsrf: true });
|
|
406
|
+
|
|
407
|
+
await request(app)
|
|
408
|
+
.post("/field/show-calculated/patients/pagesp12/show")
|
|
409
|
+
.set("Cookie", loginCookie)
|
|
410
|
+
.send({
|
|
411
|
+
id: 1,
|
|
412
|
+
})
|
|
413
|
+
.expect(toBeTrue((r) => +r.text > 2));
|
|
414
|
+
});
|
|
394
415
|
it("should show calculated field with double joinfield", async () => {
|
|
395
416
|
const loginCookie = await getAdminLoginCookie();
|
|
396
417
|
const table = Table.findOne({ name: "readings" });
|