@saltcorn/server 1.0.0-beta.14 → 1.0.0-beta.16

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/load_plugins.js

@@ -173,7 +173,7 @@ const loadAllPlugins = async (force) => {
     }
   }
   await getState().refreshUserLayouts();
-  await getState().refresh(true);
+  await getState().refresh(true, true);
   if (!isRoot()) reloadAuthFromRoot();
 };
 

package/locales/en.json

@@ -1472,5 +1472,6 @@
 	"Minimum user role required to create a new tenant<div class=\"alert alert-danger fst-normal\" role=\"alert\" data-show-if=\"showIfFormulaInputs($('select[name=role_to_create_tenant]'), '+role_to_create_tenant>1')\">Giving non-trusted users access to create tenants is a security risk and not recommended.</div>": "Minimum user role required to create a new tenant<div class=\"alert alert-danger fst-normal\" role=\"alert\" data-show-if=\"showIfFormulaInputs($('select[name=role_to_create_tenant]'), '+role_to_create_tenant>1')\">Giving non-trusted users access to create tenants is a security risk and not recommended.</div>",
 	"Select tag": "Select tag",
 	"Invalid build directory path": "Invalid build directory path",
-	"Invalid build directory name": "Invalid build directory name"
-}
+	"Invalid build directory name": "Invalid build directory name",
+	"clean node_modules": "clean node_modules"
+}

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.0.0-beta.14",
+  "version": "1.0.0-beta.16",
   "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.14",
-    "@saltcorn/builder": "1.0.0-beta.14",
-    "@saltcorn/data": "1.0.0-beta.14",
-    "@saltcorn/admin-models": "1.0.0-beta.14",
-    "@saltcorn/filemanager": "1.0.0-beta.14",
-    "@saltcorn/markup": "1.0.0-beta.14",
-    "@saltcorn/plugins-loader": "1.0.0-beta.14",
-    "@saltcorn/sbadmin2": "1.0.0-beta.14",
+    "@saltcorn/base-plugin": "1.0.0-beta.16",
+    "@saltcorn/builder": "1.0.0-beta.16",
+    "@saltcorn/data": "1.0.0-beta.16",
+    "@saltcorn/admin-models": "1.0.0-beta.16",
+    "@saltcorn/filemanager": "1.0.0-beta.16",
+    "@saltcorn/markup": "1.0.0-beta.16",
+    "@saltcorn/plugins-loader": "1.0.0-beta.16",
+    "@saltcorn/sbadmin2": "1.0.0-beta.16",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -18,7 +18,7 @@ function monospace_block_click(e) {
 function copy_monospace_block(e) {
   let e1 = $(e).next("pre");
   let e2 = $(e1).next("pre");
-  if (!e2.length) return navigator.clipboard.writeText($(el).text());
+  if (!e2.length) return navigator.clipboard.writeText($(e1).text());
   const e1t = e1.text();
   const e2t = e2.text();
   if (e1t.length > e2t.length) return navigator.clipboard.writeText(e1t);
@@ -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/public/saltcorn.js

@@ -225,8 +225,10 @@ function ajax_done(res, viewname) {
 function spin_action_link(e) {
   const $e = $(e);
   const width = $e.width();
+  const height = $e.height();
+
   $e.attr("data-innerhtml-prespin", $e.html());
-  $e.html('<i class="fas fa-spinner fa-spin"></i>').width(width);
+  $e.html('<i class="fas fa-spinner fa-spin"></i>').width(width).height(height);
 }
 
 function reset_spinners() {
@@ -870,7 +872,7 @@ function build_mobile_app(button) {
 
   if (
     params.useDocker &&
-    !cordovaBuilderAvailable &&
+    !window.cordovaBuilderAvailable &&
     !confirm(
       "Docker is selected but the Cordova builder seems not to be installed. " +
         "Do you really want to continue?"
@@ -878,6 +880,21 @@ function build_mobile_app(button) {
   ) {
     return;
   }
+
+  const notSupportedPlugins = params.includedPlugins.filter(
+    (plugin) => !window.pluginsReadyForMobile.includes(plugin)
+  );
+  if (
+    notSupportedPlugins.length > 0 &&
+    !confirm(
+      `It seems that the plugins '${notSupportedPlugins.join(
+        ", "
+      )}' are not ready for mobile. Do you really want to continue?`
+    )
+  ) {
+    return;
+  }
+
   ajax_post("/admin/build-mobile-app", {
     data: params,
     success: (data) => {
@@ -949,8 +966,8 @@ function check_cordova_builder() {
   $.ajax("/admin/mobile-app/check-cordova-builder", {
     type: "GET",
     success: function (res) {
-      cordovaBuilderAvailable = !!res.installed;
-      if (cordovaBuilderAvailable) {
+      window.cordovaBuilderAvailable = !!res.installed;
+      if (window.cordovaBuilderAvailable) {
         $("#dockerBuilderStatusId").html(
           `<span>
             installed<i class="ps-2 fas fa-check text-success"></i>
@@ -1044,7 +1061,7 @@ function toggle_tbl_sync() {
 function toggle_android_platform() {
   if ($("#androidCheckboxId")[0].checked === true) {
     $("#dockerCheckboxId").attr("hidden", false);
-    $("#dockerCheckboxId").attr("checked", cordovaBuilderAvailable);
+    $("#dockerCheckboxId").attr("checked", window.cordovaBuilderAvailable);
     $("#dockerLabelId").removeClass("d-none");
   } else {
     $("#dockerCheckboxId").attr("hidden", true);

package/routes/actions.js

@@ -154,10 +154,12 @@ const triggerForm = async (req, trigger) => {
     .filter(([k, v]) => v.hasChannel)
     .map(([k, v]) => k);
 
-  const allActions = Trigger.action_options(false);
+  const allActions = Trigger.action_options({ notRequireRow: false });
   const table_triggers = ["Insert", "Update", "Delete", "Validate"];
   const action_options = {};
-  const actionsNotRequiringRow = Trigger.action_options(true);
+  const actionsNotRequiringRow = Trigger.action_options({
+    notRequireRow: true,
+  });
 
   Trigger.when_options.forEach((t) => {
     if (table_triggers.includes(t)) action_options[t] = allActions;

package/routes/admin.js

@@ -1281,6 +1281,7 @@ router.get(
         throw new Error(req.__("Unable to fetch versions"));
       const versions = Object.keys(pkgInfo.versions);
       if (versions.length === 0) throw new Error(req.__("No versions found"));
+      const tags = pkgInfo["dist-tags"] || {};
       res.set("Page-Title", req.__("%s versions", "Saltcorn"));
       let selected = packagejson.version;
       res.send(
@@ -1290,6 +1291,7 @@ router.get(
             method: "post",
           },
           input({ type: "hidden", name: "_csrf", value: req.csrfToken() }),
+          // version select
           div(
             { class: "form-group" },
             label(
@@ -1315,6 +1317,37 @@ router.get(
               )
             )
           ),
+          // tag select
+          div(
+            { class: "form-group" },
+            label(
+              {
+                for: "tag_select",
+                class: "form-label fw-bold",
+              },
+              req.__("Tags")
+            ),
+            select(
+              {
+                id: "tag_select",
+                class: "form-control form-select",
+              },
+              option({
+                id: "empty_opt",
+                value: "",
+                label: req.__("Select tag"),
+                selected: true,
+              }),
+              Object.keys(tags).map((tag) =>
+                option({
+                  id: `${tag}_opt`,
+                  value: tags[tag],
+                  label: `${tag} (${tags[tag]})`,
+                })
+              )
+            )
+          ),
+          // deep clean checkbox
           div(
             { class: "form-group" },
             input({
@@ -1351,7 +1384,18 @@ router.get(
               req.__("Install")
             )
           )
-        )
+        ) +
+          script(
+            domReady(`
+document.getElementById('tag_select').addEventListener('change', () => {
+  const version = document.getElementById('tag_select').value;
+  if (version) document.getElementById('version_select').value = version;
+});
+document.getElementById('version_select').addEventListener('change', () => {
+  document.getElementById('tag_select').value = '';
+});
+`)
+          )
       );
     } catch (error) {
       getState().log(
@@ -1780,8 +1824,8 @@ router.get(
     });
   })
 );
-const buildDialogScript = (cordovaBuilderAvailable) => {
-  return `<script>
+const buildDialogScript = (cordovaBuilderAvailable) =>
+  `<script>
   var cordovaBuilderAvailable = ${cordovaBuilderAvailable};
   function showEntrySelect(type) {
     for( const currentType of ["view", "page", "pagegroup"]) {
@@ -1807,7 +1851,6 @@ const buildDialogScript = (cordovaBuilderAvailable) => {
     notifyAlert("Building the app, please wait.", true)
   }
   </script>`;
-};
 
 const imageAvailable = async () => {
   try {
@@ -1865,6 +1908,9 @@ router.get(
     const plugins = (await Plugin.find()).filter(
       (plugin) => ["base", "sbadmin2"].indexOf(plugin.name) < 0
     );
+    const pluginsReadyForMobile = plugins
+      .filter((plugin) => plugin.ready_for_mobile())
+      .map((plugin) => plugin.name);
     const builderSettings =
       getState().getConfig("mobile_builder_settings") || {};
     const dockerAvailable = await imageAvailable();
@@ -1879,6 +1925,11 @@ router.get(
         {
           headerTag: buildDialogScript(dockerAvailable),
         },
+        {
+          headerTag: `<script>var pluginsReadyForMobile = ${JSON.stringify(
+            pluginsReadyForMobile
+          )}</script>`,
+        },
       ],
       contents: {
         above: [

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/menu.js

@@ -269,6 +269,9 @@ const menuForm = async (req) => {
         name: "icon",
         class: "item-menu",
         input_type: "hidden",
+        showIf: {
+          type: ["View", "Page", "Page Group", "Link", "Header", "Action"],
+        },
       },
       {
         name: "tooltip",

package/routes/pageedit.js

@@ -183,6 +183,12 @@ const pageBuilderData = async (req, context) => {
       });
     }
   }
+  const actionsNotRequiringRow = Trigger.action_options({
+    notRequireRow: true,
+    apiNeverTriggers: true,
+    builtInLabel: "Page Actions",
+    builtIns: ["GoBack"],
+  });
   const library = (await Library.find({})).filter((l) => l.suitableFor("page"));
   const fixed_state_fields = {};
   for (const view of views) {
@@ -228,7 +234,7 @@ const pageBuilderData = async (req, context) => {
     images,
     pages,
     page_groups,
-    actions,
+    actions: actionsNotRequiringRow,
     builtInActions: ["GoBack"],
     library,
     min_role: context.min_role,

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/routes/tables.js

@@ -670,7 +670,10 @@ router.get(
  * @param {string} lbl
  * @returns {string}
  */
-const badge = (col, lbl) => `<span class="badge bg-${col}">${lbl}</span>&nbsp;`;
+const badge = (col, lbl, title) =>
+  `<span ${
+    title ? `title="${title}" ` : ""
+  }class="badge bg-${col}">${lbl}</span>&nbsp;`;
 
 /**
  * @param {object} f
@@ -708,8 +711,11 @@ const attribBadges = (f) => {
         ].includes(k)
       )
         return;
-      if(Array.isArray(v) && !v.length) return;
-      if (v || v === 0) s += badge("secondary", k);
+      if (Array.isArray(v) && !v.length) return;
+      const title = ["string", "number", "boolean"].includes(typeof v)
+        ? `${v}`
+        : null;
+      if (v || v === 0) s += badge("secondary", k, title);
     });
   }
   return s;

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" });