@saltcorn/server 0.8.7-beta.1 → 0.8.7-beta.2

package/locales/en.json

@@ -1174,5 +1174,6 @@
 	"Splash Page": "Splash Page",
 	"App version": "App version",
 	"Forgot password?": "Forgot password?",
-	"Details": "Details"
+	"Details": "Details",
+	"URL is a formula?": "URL is a formula?"
 }

package/markup/admin.js

@@ -81,6 +81,7 @@ const add_edit_bar = ({
 }) => {
   if (role > 1 && req && req.xhr) return { above: [contents] }; //make sure not put in card
   if (role > 1) return contents;
+  if (req && req.headers.localizedstate) return { above: [contents] };
   let viewSpec = "";
   if (viewtemplate) viewSpec = viewtemplate;
   if (table) {

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.7-beta.1",
+  "version": "0.8.7-beta.2",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.7-beta.1",
-    "@saltcorn/builder": "0.8.7-beta.1",
-    "@saltcorn/data": "0.8.7-beta.1",
-    "@saltcorn/admin-models": "0.8.7-beta.1",
-    "@saltcorn/filemanager": "0.8.7-beta.1",
-    "@saltcorn/markup": "0.8.7-beta.1",
-    "@saltcorn/sbadmin2": "0.8.7-beta.1",
+    "@saltcorn/base-plugin": "0.8.7-beta.2",
+    "@saltcorn/builder": "0.8.7-beta.2",
+    "@saltcorn/data": "0.8.7-beta.2",
+    "@saltcorn/admin-models": "0.8.7-beta.2",
+    "@saltcorn/filemanager": "0.8.7-beta.2",
+    "@saltcorn/markup": "0.8.7-beta.2",
+    "@saltcorn/sbadmin2": "0.8.7-beta.2",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/gridedit.js

@@ -4,10 +4,11 @@ function showHideCol(nm, e) {
 }
 
 function lookupIntToString(cell, formatterParams, onRendered) {
-  const cellVal = cell.getValue()
-  const val = typeof cellVal === "object" && cellVal !== null
-    ? `${cellVal.id}`
-    : `${cellVal}`;
+  const cellVal = cell.getValue();
+  const val =
+    typeof cellVal === "object" && cellVal !== null
+      ? `${cellVal.id}`
+      : `${cellVal}`;
   const res = formatterParams.values[val];
   return res;
 }
@@ -19,10 +20,11 @@ function deleteIcon() {
 function flatpickerEditor(cell, onRendered, success, cancel, editorParams) {
   var input = $("<input type='text'/>");
   const dayOnly = editorParams && editorParams.dayOnly;
-  let defaultDate = cell.getValue()
+  let defaultDate = cell.getValue();
 
-  if (!defaultDate) defaultDate = new Date()
+  if (!defaultDate) defaultDate = new Date();
   input.flatpickr({
+    disableMobile: true, // the native picker has problems combined with tabulator
     enableTime: !dayOnly,
     dateFormat: dayOnly ? "Y-m-d" : "Z",
     time_24hr: true,
@@ -30,7 +32,7 @@ function flatpickerEditor(cell, onRendered, success, cancel, editorParams) {
     defaultDate,
     onClose: function (selectedDates, dateStr, instance) {
       evt = window.event;
-      var isEscape = false;
+      var isEscape = false; 
       if ("key" in evt) {
         isEscape = evt.key === "Escape" || evt.key === "Esc";
       } else {
@@ -156,7 +158,8 @@ function delete_tabulator_row(e, cell) {
   if (def && def.formatterParams && def.formatterParams.confirm) {
     if (!confirm("Are you sure you want to delete this row?")) return;
   }
-  const tableName = def?.formatterParams?.tableName || window.tabulator_table_name
+  const tableName =
+    def?.formatterParams?.tableName || window.tabulator_table_name;
 
   const row = cell.getRow().getData();
   if (!row.id) {

package/public/saltcorn-common.js

@@ -568,6 +568,22 @@ function initialize_page() {
       </form>`
       );
   });
+  $("[mobile-img-path]").each(async function () {
+    if (parent.loadEncodedFile) {
+      const fileId = $(this).attr("mobile-img-path");
+      const base64Encoded = await parent.loadEncodedFile(fileId);
+      this.src = base64Encoded;
+    }
+  });
+  $("[mobile-bg-img-path]").each(async function () {
+    if (parent.loadEncodedFile) {
+      const fileId = $(this).attr("mobile-bg-img-path");
+      if (fileId) {
+        const base64Encoded = await parent.loadEncodedFile(fileId);
+        this.style.backgroundImage = `url("${base64Encoded}")`;
+      }
+    }
+  });
   function setExplainer(that) {
     var id = $(that).attr("id") + "_explainer";
 

package/public/saltcorn.js

@@ -61,9 +61,13 @@ function removeQueryStringParameter(uri1, key) {
   return uri + hash;
 }
 
-function get_current_state_url() {
+function get_current_state_url(e) {
+  const localizer = e ? $(e).closest("[data-sc-local-state]") : [];
   let $modal = $("#scmodal");
-  if ($modal.length === 0 || !$modal.hasClass("show"))
+  if (localizer.length) {
+    const localState = localizer.attr("data-sc-local-state") || "";
+    return localState;
+  } else if ($modal.length === 0 || !$modal.hasClass("show"))
     return window.location.href;
   else return $modal.prop("data-modal-state");
 }
@@ -72,8 +76,8 @@ function select_id(id) {
   pjax_to(updateQueryStringParameter(get_current_state_url(), "id", id));
 }
 
-function set_state_field(key, value) {
-  pjax_to(updateQueryStringParameter(get_current_state_url(), key, value));
+function set_state_field(key, value, e) {
+  pjax_to(updateQueryStringParameter(get_current_state_url(e), key, value), e);
 }
 
 function check_state_field(that) {
@@ -97,8 +101,8 @@ function invalidate_pagings(href) {
   return newhref;
 }
 
-function set_state_fields(kvs, disable_pjax) {
-  let newhref = get_current_state_url();
+function set_state_fields(kvs, disable_pjax, e) {
+  let newhref = get_current_state_url(e);
   if (Object.keys(kvs).some((k) => !is_paging_param(k))) {
     newhref = invalidate_pagings(newhref);
   }
@@ -108,10 +112,10 @@ function set_state_fields(kvs, disable_pjax) {
     else newhref = updateQueryStringParameter(newhref, kv[0], kv[1]);
   });
   if (disable_pjax) href_to(newhref.replace("&&", "&").replace("?&", "?"));
-  else pjax_to(newhref.replace("&&", "&").replace("?&", "?"));
+  else pjax_to(newhref.replace("&&", "&").replace("?&", "?"), e);
 }
-function unset_state_field(key) {
-  pjax_to(removeQueryStringParameter(get_current_state_url(), key));
+function unset_state_field(key, e) {
+  pjax_to(removeQueryStringParameter(get_current_state_url(e), key), e);
 }
 
 let loadPage = true;
@@ -124,29 +128,37 @@ $(function () {
   });
 });
 
-function pjax_to(href) {
+function pjax_to(href, e) {
   let $modal = $("#scmodal");
   const inModal = $modal.length && $modal.hasClass("show");
-  let $dest = inModal ? $("#scmodal .modal-body") : $("#page-inner-content");
-
+  const localizer = e ? $(e).closest("[data-sc-local-state]") : [];
+  let $dest = localizer.length
+    ? localizer
+    : inModal
+    ? $("#scmodal .modal-body")
+    : $("#page-inner-content");
   if (!$dest.length) window.location.href = href;
   else {
     loadPage = false;
+    const headers = {
+      pjaxpageload: "true",
+    };
+    if (localizer.length) headers.localizedstate = "true";
     $.ajax(href, {
-      headers: {
-        pjaxpageload: "true",
-      },
+      headers,
       success: function (res, textStatus, request) {
-        if (!inModal) window.history.pushState({ url: href }, "", href);
+        if (!inModal && !localizer.length)
+          window.history.pushState({ url: href }, "", href);
         setTimeout(() => {
           loadPage = true;
         }, 0);
-        if (!inModal && res.includes("<!--SCPT:")) {
+        if (!inModal && !localizer.length && res.includes("<!--SCPT:")) {
           const start = res.indexOf("<!--SCPT:");
           const end = res.indexOf("-->", start);
           document.title = res.substring(start + 9, end);
         }
         $dest.html(res);
+        if (localizer.length) localizer.attr("data-sc-local-state", href);
         initialize_page();
       },
       error: function (res) {

package/routes/actions.js

@@ -577,17 +577,23 @@ router.get(
     const { id } = req.params;
     const trigger = await Trigger.findOne({ id });
     const output = [];
+    const ppVal = (x) =>
+      typeof x === "string"
+        ? x
+        : typeof x === "function"
+        ? x.toString()
+        : JSON.stringify(x, null, 2);
     const fakeConsole = {
       log(...s) {
         console.log(...s);
-        output.push(div(code(pre(text(s.join(" "))))));
+        output.push(div(code(pre(text(s.map(ppVal).join(" "))))));
       },
       error(...s) {
         output.push(
           div(
             code(
               { style: "color:red;font-weight:bold;" },
-              pre(text(s.join(" ")))
+              pre(text(s.map(ppVal).join(" ")))
             )
           )
         );

package/routes/admin.js

@@ -451,7 +451,10 @@ router.get(
   "/snapshot-list",
   isAdmin,
   error_catcher(async (req, res) => {
-    const snaps = await Snapshot.find();
+    const snaps = await Snapshot.find(
+      {},
+      { orderBy: "created", orderDesc: true, fields: ["id", "created", "hash"] }
+    );
     send_admin_page({
       res,
       req,

package/routes/api.js

@@ -19,7 +19,10 @@ const Router = require("express-promise-router");
 const { error_catcher } = require("./utils.js");
 //const { mkTable, renderForm, link, post_btn } = require("@saltcorn/markup");
 const { getState } = require("@saltcorn/data/db/state");
-const { prepare_update_row } = require("@saltcorn/data/web-mobile-commons");
+const {
+  prepare_update_row,
+  prepare_insert_row,
+} = require("@saltcorn/data/web-mobile-commons");
 const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
 //const Field = require("@saltcorn/data/models/field");
@@ -28,9 +31,9 @@ const Trigger = require("@saltcorn/data/models/trigger");
 const passport = require("passport");
 
 const {
-  stateFieldsToWhere,
   readState,
   strictParseInt,
+  stateFieldsToWhere,
 } = require("@saltcorn/data/plugin-helper");
 const Crash = require("@saltcorn/data/models/crash");
 
@@ -391,34 +394,8 @@ router.post(
           const { _versions, ...row } = req.body;
           const fields = table.getFields();
           readState(row, fields, req);
-          let errors = [];
-          let hasErrors = false;
-          Object.keys(row).forEach((k) => {
-            const field = fields.find((f) => f.name === k);
-            if (!field || field.calculated || row[k] === undefined) {
-              delete row[k];
-              return;
-            }
-            if (field.type && field.type.validate) {
-              const vres = field.type.validate(field.attributes || {})(row[k]);
-              if (vres.error) {
-                hasErrors = true;
-                errors.push(`${k}: ${vres.error}`);
-              }
-            }
-          });
-          fields.forEach((field) => {
-            if (
-              field.required &&
-              !field.primary_key &&
-              typeof row[field.name] === "undefined" &&
-              !field.attributes.default
-            ) {
-              hasErrors = true;
-              errors.push(`${field.name}: required`);
-            }
-          });
-          if (hasErrors) {
+          const errors = await prepare_insert_row(row, fields);
+          if (errors.length > 0) {
             getState().log(
               2,
               `API POST ${table.name} error: ${errors.join(", ")}`

package/routes/files.js

@@ -90,7 +90,7 @@ router.get(
       for (const file of rows) {
         file.location = file.path_to_serve;
       }
-      const directories = await File.allDirectories();
+      const directories = await File.allDirectories(true);
       for (const file of directories) {
         file.location = file.path_to_serve;
       }

package/routes/menu.js

@@ -151,10 +151,18 @@ const menuForm = async (req) => {
       {
         name: "url",
         label: req.__("URL"),
-        class: "item-menu",
+        class: "item-menu validate-expression validate-expression-conditional",
         input_type: "text",
         showIf: { type: "Link" },
       },
+      {
+        name: "url_formula",
+        label: req.__("URL is a formula?"),
+        type: "Bool",
+        class: "item-menu",
+        required: false,
+        showIf: { type: "Link" },
+      },
       {
         name: "pagename",
         label: req.__("Page"),

package/routes/sync.js

@@ -9,8 +9,9 @@ module.exports = router;
 
 const pickFields = (table, row) => {
   const result = {};
-  for (const { name, type } of table.getFields()) {
-    if (name === "id") continue;
+  const fields = table.getFields();
+  for (const { name, type, calculated } of table.getFields()) {
+    if (name === "id" || calculated) continue;
     if (type?.name === "Date") {
       result[name] = row[name] ? new Date(row[name]) : undefined;
     } else {

package/routes/viewedit.js

@@ -22,6 +22,7 @@ const View = require("@saltcorn/data/models/view");
 const Workflow = require("@saltcorn/data/models/workflow");
 const User = require("@saltcorn/data/models/user");
 const Page = require("@saltcorn/data/models/page");
+const File = require("@saltcorn/data/models/file");
 const db = require("@saltcorn/data/db");
 const { sleep } = require("@saltcorn/data/utils");
 
@@ -580,6 +581,12 @@ router.get(
   "/config/:name",
   isAdmin,
   error_catcher(async (req, res) => {
+    req.socket.on("close", () => {
+      File.destroyDirCache();
+    });
+    req.socket.on("timeout", () => {
+      File.destroyDirCache();
+    });
     const { name } = req.params;
     const { step } = req.query;
     const [view] = await View.find({ name });

package/wrapper.js

@@ -34,7 +34,7 @@ const get_menu = (req) => {
   const login_menu = state.getConfig("login_menu");
   const locale = req.getLocale();
   const __ = (s) => state.i18n.__({ phrase: s, locale }) || s;
-  const extra_menu = get_extra_menu(role, __);
+  const extra_menu = get_extra_menu(role, __, req.user || {}, locale);
   const authItems = isAuth
     ? [
         {