@saltcorn/server 1.0.0-beta.15 → 1.0.0-beta.17

package/app.js

@@ -306,13 +306,7 @@ const getApp = async (opts = {}) => {
             ? new Date(u.last_mobile_login).valueOf()
             : u.last_mobile_login) <= jwt_payload.iat
         ) {
-          return done(null, {
-            email: u.email,
-            id: u.id,
-            role_id: u.role_id,
-            language: u.language,
-            tenant: db.getTenantSchema(),
-          });
+          return done(null, u.session_object);
         } else {
           return done(null, { role_id: 100 });
         }

package/help/Date format.tmd

@@ -0,0 +1,55 @@
+You can define how a date value should be shown by specifying a date format string
+which supports a range of formatting options. The formatting is provided by the 
+[Day.js](https://day.js.org/docs/en/display/format) library with the 
+[AdvancedFormat](https://day.js.org/docs/en/plugin/advanced-format) extension. Those links
+give the full definition for the available format options.
+
+When a date is rendered with a format string, certain specific character sequences are
+substituted for parts of the date value. Any unrecognized characters are repeated verbatim
+in the output and you can used that for separator charcters such as hyphens (-) or slashes (/).
+
+For example, the timepoint 11.15am on Friday, 4 October 2024 is rendered, according to the 
+format string:
+
+{{# const d = new Date('2024-10-04T11:15:00.000')}}
+
+| Format string       | Output       |
+| ------------------- | ------------ |
+| YYYY-MM-DD          | {{ moment(d).format("YYYY-MM-DD")}} |
+| H:mm on dddd, D MMMM YYYY | {{ moment(d).format("H:mm on dddd, D MMMM YYYY")}} |
+
+The full list of supported format sequences are:
+
+| Format | Output | Description |
+| --- | --- | --- |
+| `YY` | 18  | Two-digit year |
+| `YYYY` | 2018 | Four-digit year |
+| `M` | 1-12 | The month, beginning at 1 |
+| `MM` | 01-12 | The month, 2-digits |
+| `MMM` | Jan-Dec | The abbreviated month name |
+| `MMMM` | January-December | The full month name |
+| `D` | 1-31 | The day of the month |
+| `DD` | 01-31 | The day of the month, 2-digits |
+| `d` | 0-6 | The day of the week, with Sunday as 0 |
+| `dd` | Su-Sa | The min name of the day of the week |
+| `ddd` | Sun-Sat | The short name of the day of the week |
+| `dddd` | Sunday-Saturday | The name of the day of the week |
+| `H` | 0-23 | The hour |
+| `HH` | 00-23 | The hour, 2-digits |
+| `h` | 1-12 | The hour, 12-hour clock |
+| `hh` | 01-12 | The hour, 12-hour clock, 2-digits |
+| `m` | 0-59 | The minute |
+| `mm` | 00-59 | The minute, 2-digits |
+| `s` | 0-59 | The second |
+| `ss` | 00-59 | The second, 2-digits |
+| `SSS` | 000-999 | The millisecond, 3-digits |
+| `Z` | +05:00 | The offset from UTC, ±HH:mm |
+| `ZZ` | +0500 | The offset from UTC, ±HHmm |
+| `A` | AM PM |     |
+| `a` | am pm |     |
+| `Q` | 1-4 | Quarter |
+| `Do` | 1st 2nd ... 31st | Day of Month with ordinal |
+| `k` | 1-24 | The hour, beginning at 1 |
+| `kk` | 01-24 | The hour, 2-digits, beginning at 1 |
+| `X` | 1360013296 | Unix Timestamp in second |
+| `x` | 1360013296123 | Unix Timestamp in millisecond |

package/help/index.js

@@ -5,6 +5,7 @@ const _ = require("underscore");
 const fs = require("fs").promises;
 const MarkdownIt = require("markdown-it"),
   md = new MarkdownIt();
+const moment = require("moment");
 
 const { pre } = require("@saltcorn/markup/tags");
 const path = require("path");
@@ -33,6 +34,7 @@ const get_help_markup = async (topic, query, req) => {
       scState: getState(),
       query,
       oneOf,
+      moment,
     };
     const mdTemplate = await get_md_file(topic);
     if (!mdTemplate) return { markup: "Topic not found" };

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.0.0-beta.15",
+  "version": "1.0.0-beta.17",
   "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": "1.0.0-beta.15",
-    "@saltcorn/builder": "1.0.0-beta.15",
-    "@saltcorn/data": "1.0.0-beta.15",
-    "@saltcorn/admin-models": "1.0.0-beta.15",
-    "@saltcorn/filemanager": "1.0.0-beta.15",
-    "@saltcorn/markup": "1.0.0-beta.15",
-    "@saltcorn/plugins-loader": "1.0.0-beta.15",
-    "@saltcorn/sbadmin2": "1.0.0-beta.15",
+    "@saltcorn/base-plugin": "1.0.0-beta.17",
+    "@saltcorn/builder": "1.0.0-beta.17",
+    "@saltcorn/data": "1.0.0-beta.17",
+    "@saltcorn/admin-models": "1.0.0-beta.17",
+    "@saltcorn/filemanager": "1.0.0-beta.17",
+    "@saltcorn/markup": "1.0.0-beta.17",
+    "@saltcorn/plugins-loader": "1.0.0-beta.17",
+    "@saltcorn/sbadmin2": "1.0.0-beta.17",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -55,7 +55,7 @@
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
     "qrcode": "1.5.1",
-    "resize-with-sharp-or-jimp": "0.1.7",
+    "resize-with-sharp-or-jimp": "0.1.8",
     "semver": "^7.6.0",
     "socket.io": "4.6.0",
     "systeminformation": "^5.21.7",

package/public/saltcorn-common.js

@@ -1365,10 +1365,14 @@ function notifyAlert(note, spin) {
   if (typeof note == "string") {
     txt = note;
     type = "info";
-  } else {
+  } else if (note.text) {
     txt = note.text;
-    type = note.type;
+    type = note.type || "info";
+  } else {
+    type = "info";
+    txt = JSON.stringify(note, null, 2);
   }
+
   const { id, html } = buildToast(txt, type, spin);
   let $modal = $("#scmodal");
   if ($modal.length && $modal.hasClass("show"))

package/routes/actions.js

@@ -546,7 +546,10 @@ router.get(
     let trigger;
     let id = parseInt(idorname);
     if (id) trigger = await Trigger.findOne({ id });
-    else trigger = await Trigger.findOne({ name: idorname });
+    else {
+      trigger = await Trigger.findOne({ name: idorname });
+      id = trigger.id;
+    }
 
     if (!trigger) {
       req.flash("warning", req.__("Action not found"));

package/routes/admin.js

@@ -3224,8 +3224,8 @@ router.post(
   error_catcher(async (req, res) => {
     const state = getState();
     const child = spawn(
-      "docker",
-      ["image", "pull", "saltcorn/cordova-builder:latest"],
+      `${process.env.DOCKER_BIN ? `${process.env.DOCKER_BIN}/` : ""}docker`,
+      ["pull", "saltcorn/cordova-builder:latest"],
       {
         stdio: ["ignore", "pipe", "pipe"],
         cwd: ".",

package/routes/eventlog.js

@@ -41,6 +41,7 @@ const {
   i,
   th,
   pre,
+  text,
 } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const { send_events_page } = require("../markup/admin.js");
@@ -442,7 +443,7 @@ router.get(
           ) +
           div(
             { class: "eventpayload" },
-            ev.payload ? pre(JSON.stringify(ev.payload, null, 2)) : ""
+            ev.payload ? pre(text(JSON.stringify(ev.payload, null, 2))) : ""
           ),
       },
     });

package/routes/fields.js

@@ -919,12 +919,19 @@ router.post(
   "/test-formula",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { formula, tablename, stored } = req.body;
+    let { formula, tablename, stored } = req.body;
+    if (stored === "false") stored = false;
+
     const table = Table.findOne({ name: tablename });
     const fields = table.getFields();
     const freeVars = freeVariables(formula);
     const joinFields = {};
-    if (stored) add_free_variables_to_joinfields(freeVars, joinFields, fields);
+    add_free_variables_to_joinfields(freeVars, joinFields, fields);
+    if (!stored && Object.keys(joinFields).length > 0) {
+      return res
+        .status(400)
+        .send(`Joinfields only permitted in stored calculated fields`);
+    }
     const rows = await table.getJoinedRows({
       joinFields,
       orderBy: "RANDOM()",
@@ -950,9 +957,9 @@ router.post(
       );
     } catch (e) {
       console.error(e);
-      return res.send(
-        `Error on running on row with id=${rows[0].id}: ${e.message}`
-      );
+      return res
+        .status(400)
+        .send(`Error on running on row with id=${rows[0].id}: ${e.message}`);
     }
   })
 );

package/routes/infoarch.js

@@ -14,7 +14,7 @@ const {
 } = require("../markup/admin.js");
 const { getState } = require("@saltcorn/data/db/state");
 const { div, a, i, text } = require("@saltcorn/markup/tags");
-const { mkTable, renderForm } = require("@saltcorn/markup");
+const { mkTable, renderForm, post_delete_btn } = require("@saltcorn/markup");
 const Form = require("@saltcorn/data/models/form");
 
 /**
@@ -119,6 +119,15 @@ router.get(
                       })
                     : "",
               },
+              {
+                label: req.__("Delete"),
+                key: (r) =>
+                  post_delete_btn(
+                    `/site-structure/localizer/delete-lang/${r.locale}`,
+                    req,
+                    r.name
+                  ),
+              },
             ],
             Object.values(cfgLangs)
           ),
@@ -287,3 +296,25 @@ router.post(
     }
   })
 );
+
+/**
+ * @name post/localizer/save-lang
+ * @function
+ * @memberof module:routes/infoarch~infoarchRouter
+ * @function
+ */
+router.post(
+  "/localizer/delete-lang/:lang",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { lang } = req.params;
+
+    const cfgLangs = getState().getConfig("localizer_languages");
+    if (cfgLangs[lang]) {
+      delete cfgLangs[lang];
+      await getState().setConfig("localizer_languages", cfgLangs);
+    }
+    if (!req.xhr) res.redirect(`/site-structure/localizer`);
+    else res.json({ success: "ok" });
+  })
+);

package/routes/sync.js

@@ -335,13 +335,14 @@ router.post(
   "/clean_sync_dir",
   error_catcher(async (req, res) => {
     const { dir_name } = req.body;
+    const safe_dir_name = File.normalise(dir_name);
     try {
       const rootFolder = await File.rootFolder();
       const syncDir = path.join(
         rootFolder.location,
         "mobile_app",
         "sync",
-        dir_name
+        safe_dir_name
       );
       await fs.rm(syncDir, { recursive: true, force: true });
       res.status(200).send("");

package/tests/fields.test.js

@@ -350,6 +350,38 @@ describe("Field Endpoints", () => {
       .set("Cookie", loginCookie)
       .expect(toInclude(" is: <pre>2</pre>"));
   });
+  it("should show on stored expression with joinfield", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const table = Table.findOne({ name: "books" });
+
+    const ctx = encodeURIComponent(JSON.stringify({ table_id: table.id }));
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .post("/field/test-formula")
+      .send({
+        formula: "publisher.name",
+        tablename: "books",
+        stored: true,
+      })
+      .set("Cookie", loginCookie)
+      .expect(toInclude(" is: <pre>"));
+  });
+  it("should fail on non-stored expression with joinfield", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const table = Table.findOne({ name: "books" });
+
+    const ctx = encodeURIComponent(JSON.stringify({ table_id: table.id }));
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .post("/field/test-formula")
+      .send({
+        formula: "publisher.name",
+        tablename: "books",
+        stored: false,
+      })
+      .set("Cookie", loginCookie)
+      .expect(400);
+  });
   it("should show calculated", async () => {
     const loginCookie = await getAdminLoginCookie();
     const table = Table.findOne({ name: "books" });