@saltcorn/server 0.7.0-beta.4 → 0.7.0-beta.5

package/locales/en.json

@@ -876,5 +876,7 @@
 	"Could not verify code": "Could not verify code",
 	"Disable two-factor authentication": "Disable two-factor authentication",
 	"Enter your two-factor code in order to disable it": "Enter your two-factor code in order to disable it",
-	"Allow the user to enter a new key that is not in the schema": "Allow the user to enter a new key that is not in the schema"
+	"Allow the user to enter a new key that is not in the schema": "Allow the user to enter a new key that is not in the schema",
+	"Check for updates": "Check for updates",
+	"Versions refreshed": "Versions refreshed"
 }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.0-beta.4",
+  "version": "0.7.0-beta.5",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.7.0-beta.4",
-    "@saltcorn/builder": "0.7.0-beta.4",
-    "@saltcorn/data": "0.7.0-beta.4",
-    "@saltcorn/admin-models": "0.7.0-beta.4",
-    "@saltcorn/markup": "0.7.0-beta.4",
-    "@saltcorn/sbadmin2": "0.7.0-beta.4",
+    "@saltcorn/base-plugin": "0.7.0-beta.5",
+    "@saltcorn/builder": "0.7.0-beta.5",
+    "@saltcorn/data": "0.7.0-beta.5",
+    "@saltcorn/admin-models": "0.7.0-beta.5",
+    "@saltcorn/markup": "0.7.0-beta.5",
+    "@saltcorn/sbadmin2": "0.7.0-beta.5",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",

package/routes/admin.js

@@ -399,6 +399,15 @@ router.get(
                           ? span(
                               { class: "badge bg-primary ms-2" },
                               req.__("Latest")
+                            ) +
+                            post_btn(
+                              "/admin/check-for-upgrade",
+                              req.__("Check for updates"),
+                              req.csrfToken(),
+                              {
+                                btnClass: "btn-primary btn-sm px-1 py-0",
+                                formClass: "d-inline",
+                              }
                             )
                           : "")
                     )
@@ -499,7 +508,15 @@ router.post(
     }
   })
 );
-
+router.post(
+  "/check-for-upgrade",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    await getState().deleteConfig("latest_npm_version");
+    req.flash("success", req.__(`Versions refreshed`));
+    res.redirect(`/admin/system`);
+  })
+);
 /**
  * @name post/backup
  * @function

package/routes/fields.js

@@ -631,14 +631,19 @@ router.post(
     if (fieldName.includes(".")) {
       //join field
       const kpath = fieldName.split(".");
-
       if (kpath.length === 2 && row[kpath[0]]) {
         const field = fields.find((f) => f.name === kpath[0]);
         const reftable = await Table.findOne({ name: field.reftable_name });
         const targetField = (await reftable.getFields()).find(
           (f) => f.name === kpath[1]
         );
-        const fv = targetField.type.fieldviews[fieldview];
+        //console.log({ kpath, fieldview, targetField });
+        let fv = targetField.type.fieldviews[fieldview];
+        if (!fv) {
+          fv =
+            targetField.type.fieldviews.show ||
+            targetField.type.fieldviews.as_text;
+        }
         const q = { [reftable.pk_name]: row[kpath[0]] };
         const refRow = await reftable.getRow(q);
         const configuration = req.query;
@@ -648,6 +653,25 @@ router.post(
         readState(configuration, configFields);
         res.send(fv.run(refRow[kpath[1]], req, configuration));
         return;
+      } else if (row[kpath[0]]) {
+        let oldTable = table;
+        let oldRow = row;
+        for (const ref of kpath) {
+          const ofields = await oldTable.getFields();
+          const field = ofields.find((f) => f.name === ref);
+          if (field.is_fkey) {
+            const reftable = await Table.findOne({ name: field.reftable_name });
+            if (!oldRow[ref]) break;
+            const q = { [reftable.pk_name]: oldRow[ref] };
+            oldRow = await reftable.getRow(q);
+            oldTable = reftable;
+          }
+        }
+        if (oldRow) {
+          const value = oldRow[kpath[kpath.length - 1]];
+          res.send(value);
+          return;
+        }
       }
       res.send("");
       return;

package/tests/fields.test.js

@@ -100,8 +100,8 @@ describe("Field Endpoints", () => {
     await request(app)
       .post("/field/")
       .send("stepName=Basic properties")
-      .send("name=Publisher")
-      .send("label=Publisher")
+      .send("name=Editor")
+      .send("label=Editor")
       .send("type=String")
       .send("contextEnc=" + ctx)
       .set("Cookie", loginCookie)

package/tests/table.test.js

@@ -33,9 +33,9 @@ describe("Table Endpoints", () => {
       .post("/table/")
       .send("name=mypostedtable")
       .set("Cookie", loginCookie)
-      .expect(toRedirect("/table/6"));
+      .expect(toRedirect("/table/7"));
     await request(app)
-      .get("/table/6")
+      .get("/table/7")
       .set("Cookie", loginCookie)
       .expect(toInclude("mypostedtable"));
     await request(app)
@@ -149,7 +149,7 @@ Pencil, 0.5,2, t`;
       .set("Cookie", loginCookie)
       .field("name", "expenses")
       .attach("file", Buffer.from(csv, "utf-8"))
-      .expect(toRedirect("/table/7"));
+      .expect(toRedirect("/table/8"));
   });
   it("should upload csv to existing table", async () => {
     const csv = `author,Pages