@saltcorn/server 0.9.6-beta.10 → 0.9.6-beta.12

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.6-beta.10",
+  "version": "0.9.6-beta.12",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "0.9.6-beta.10",
-    "@saltcorn/builder": "0.9.6-beta.10",
-    "@saltcorn/data": "0.9.6-beta.10",
-    "@saltcorn/admin-models": "0.9.6-beta.10",
-    "@saltcorn/filemanager": "0.9.6-beta.10",
-    "@saltcorn/markup": "0.9.6-beta.10",
-    "@saltcorn/plugins-loader": "0.9.6-beta.10",
-    "@saltcorn/sbadmin2": "0.9.6-beta.10",
+    "@saltcorn/base-plugin": "0.9.6-beta.12",
+    "@saltcorn/builder": "0.9.6-beta.12",
+    "@saltcorn/data": "0.9.6-beta.12",
+    "@saltcorn/admin-models": "0.9.6-beta.12",
+    "@saltcorn/filemanager": "0.9.6-beta.12",
+    "@saltcorn/markup": "0.9.6-beta.12",
+    "@saltcorn/plugins-loader": "0.9.6-beta.12",
+    "@saltcorn/sbadmin2": "0.9.6-beta.12",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -1373,15 +1373,15 @@ async function common_done(res, viewnameOrElem, isWeb = true) {
     });
   }
   if (res.eval_js) await handle(res.eval_js, eval_it);
-
-  if (res.goto && !isWeb)
-    // TODO ch
-    notifyAlert({
-      type: "danger",
-      text: "Goto is not supported in a mobile deployment.",
-    });
   else if (res.goto) {
-    if (res.target === "_blank") window.open(res.goto, "_blank").focus();
+    if (!isWeb) {
+      const next = new URL(res.goto, "http://localhost");
+      const pathname = next.pathname;
+      if (pathname.startsWith("/view/") || pathname.startsWith("/page/")) {
+        const route = `get${pathname}${next.search ? "?" + next.search : ""}`;
+        await parent.handleRoute(route);
+      } else parent.cordova.InAppBrowser.open(res.goto, "_system");
+    } else if (res.target === "_blank") window.open(res.goto, "_blank").focus();
     else {
       const prev = new URL(window.location.href);
       const next = new URL(res.goto, prev.origin);

package/routes/api.js

@@ -260,6 +260,12 @@ router.get(
     );
     if (!table) {
       getState().log(3, `API get ${tableName} table not found`);
+      getState().log(
+        6,
+        `API get failure additonal info: URL=${req.originalUrl}${
+          getState().getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
+        }`
+      );
       res.status(404).json({ error: req.__("Not found") });
       return;
     }

package/routes/fields.js

@@ -1149,7 +1149,7 @@ router.post(
           const jf = table.getField(ref);
           const jtable = Table.findOne(jf.reftable_name);
           const jrow = await jtable.getRow(
-            { [jtable.pk_name]: row[ref] },
+            { [jtable.pk_name]: row[ref]?.[jtable.pk_name] || row[ref] },
             { forUser: req.user, forPublic: !req.user }
           );
           row[ref] = jrow;

package/tests/fields.test.js

@@ -391,6 +391,27 @@ describe("Field Endpoints", () => {
       })
       .expect(toBeTrue((r) => +r.text > 2));
   });
+  it("should show calculated field with two single joinfields", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const table = Table.findOne({ name: "patients" });
+    await Field.create({
+      table,
+      label: "pagesp12",
+      type: "Integer",
+      calculated: true,
+      stored: true,
+      expression: "favbook.pages+1+favbook.id",
+    });
+    const app = await getApp({ disableCsrf: true });
+
+    await request(app)
+      .post("/field/show-calculated/patients/pagesp12/show")
+      .set("Cookie", loginCookie)
+      .send({
+        id: 1,
+      })
+      .expect(toBeTrue((r) => +r.text > 2));
+  });
   it("should show calculated field with double joinfield", async () => {
     const loginCookie = await getAdminLoginCookie();
     const table = Table.findOne({ name: "readings" });

package/tests/sync.test.js

@@ -9,6 +9,7 @@ const {
   toInclude,
   toSucceed,
 } = require("../auth/testhelp");
+const load_plugins = require("../load_plugins");
 const db = require("@saltcorn/data/db");
 const { sleep } = require("@saltcorn/data/tests/mocks");
 
@@ -16,6 +17,7 @@ const Table = require("@saltcorn/data/models/table");
 const TableConstraint = require("@saltcorn/data/models/table_constraints");
 const Field = require("@saltcorn/data/models/field");
 const User = require("@saltcorn/data/models/user");
+const Plugin = require("@saltcorn/data/models/plugin");
 
 beforeAll(async () => {
   await resetToFixtures();
@@ -35,6 +37,27 @@ const initSyncInfo = async (tbls) => {
   }
 };
 
+const createAnswersTbl = async () => {
+  await load_plugins.loadAndSaveNewPlugin(
+    new Plugin({
+      name: "json",
+      source: "npm",
+      location: "@saltcorn/json",
+      version: "latest",
+    })
+  );
+  const table = await Table.create("Answers", {
+    min_role_read: 100,
+    min_role_write: 100,
+  });
+  await Field.create({
+    table,
+    name: "answer",
+    label: "Answer",
+    type: "JSON",
+  });
+};
+
 describe("load remote insert/updates", () => {
   if (!db.isSQLite) {
     beforeAll(async () => {
@@ -416,6 +439,42 @@ describe("Upload changes", () => {
       });
     });
 
+    it("upload json", async () => {
+      await createAnswersTbl();
+      const table = Table.findOne({ name: "Answers" });
+      expect(table).toBeDefined();
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      const rows = [
+        {
+          id: 1,
+          answer: true,
+        },
+        {
+          id: 2,
+          answer: false,
+        },
+        {
+          id: 3,
+          answer: 1,
+        },
+        {
+          id: 4,
+          answer: ["latte", "americano", "filter"],
+        },
+      ];
+      const resp = await doUpload(app, loginCookie, new Date().valueOf(), {
+        Answers: {
+          inserts: rows,
+        },
+      });
+      expect(resp.status).toBe(200);
+      const { syncDir } = resp._body;
+      const result = await getResult(app, loginCookie, syncDir);
+      expect(result).toBeDefined();
+      expect(await table.getRows()).toEqual(rows);
+    });
+
     it("handles inserts with TableConstraint conflicts", async () => {
       const books = Table.findOne({ name: "books" });
       const oldCount = await books.countRows();