@saltcorn/server 0.8.6-beta.16 → 0.8.6-beta.18

package/locales/en.json

@@ -1167,5 +1167,10 @@
 	"Migrations": "Migrations",
 	"Tag Entries": "Tag Entries",
 	"Not a valid field name": "Not a valid field name",
-	"Set a default value for missing data": "Set a default value for missing data"
+	"Set a default value for missing data": "Set a default value for missing data",
+	"Table triggers: ": "Table triggers: ",
+	"App name": "App name",
+	"App icon": "App icon",
+	"Splash Page": "Splash Page",
+	"App version": "App version"
 }

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.6-beta.16",
+  "version": "0.8.6-beta.18",
   "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.6-beta.16",
-    "@saltcorn/builder": "0.8.6-beta.16",
-    "@saltcorn/data": "0.8.6-beta.16",
-    "@saltcorn/admin-models": "0.8.6-beta.16",
-    "@saltcorn/filemanager": "0.8.6-beta.16",
-    "@saltcorn/markup": "0.8.6-beta.16",
-    "@saltcorn/sbadmin2": "0.8.6-beta.16",
+    "@saltcorn/base-plugin": "0.8.6-beta.18",
+    "@saltcorn/builder": "0.8.6-beta.18",
+    "@saltcorn/data": "0.8.6-beta.18",
+    "@saltcorn/admin-models": "0.8.6-beta.18",
+    "@saltcorn/filemanager": "0.8.6-beta.18",
+    "@saltcorn/markup": "0.8.6-beta.18",
+    "@saltcorn/sbadmin2": "0.8.6-beta.18",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
-    "aws-sdk": "^2.1037.0",
+    "aws-sdk": "^2.1386.0",
     "connect-flash": "^0.1.1",
     "connect-pg-simple": "^6.1.0",
     "content-disposition": "^0.5.3",

package/public/cm_modes/handlebars.js

@@ -0,0 +1,70 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"), require("../../addon/mode/multiplex"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../addon/mode/simple", "../../addon/mode/multiplex"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineSimpleMode("handlebars-tags", {
+    start: [
+      { regex: /\{\{\{/, push: "handlebars_raw", token: "tag" },
+      { regex: /\{\{!--/, push: "dash_comment", token: "comment" },
+      { regex: /\{\{!/,   push: "comment", token: "comment" },
+      { regex: /\{\{/,    push: "handlebars", token: "tag" }
+    ],
+    handlebars_raw: [
+      { regex: /\}\}\}/, pop: true, token: "tag" },
+    ],
+    handlebars: [
+      { regex: /\}\}/, pop: true, token: "tag" },
+
+      // Double and single quotes
+      { regex: /"(?:[^\\"]|\\.)*"?/, token: "string" },
+      { regex: /'(?:[^\\']|\\.)*'?/, token: "string" },
+
+      // Handlebars keywords
+      { regex: />|[#\/]([A-Za-z_]\w*)/, token: "keyword" },
+      { regex: /(?:else|this)\b/, token: "keyword" },
+
+      // Numeral
+      { regex: /\d+/i, token: "number" },
+
+      // Atoms like = and .
+      { regex: /=|~|@|true|false/, token: "atom" },
+
+      // Paths
+      { regex: /(?:\.\.\/)*(?:[A-Za-z_][\w\.]*)+/, token: "variable-2" }
+    ],
+    dash_comment: [
+      { regex: /--\}\}/, pop: true, token: "comment" },
+
+      // Commented code
+      { regex: /./, token: "comment"}
+    ],
+    comment: [
+      { regex: /\}\}/, pop: true, token: "comment" },
+      { regex: /./, token: "comment" }
+    ],
+    meta: {
+      blockCommentStart: "{{--",
+      blockCommentEnd: "--}}"
+    }
+  });
+
+  CodeMirror.defineMode("handlebars", function(config, parserConfig) {
+    var handlebars = CodeMirror.getMode(config, "handlebars-tags");
+    if (!parserConfig || !parserConfig.base) return handlebars;
+    return CodeMirror.multiplexingMode(
+      CodeMirror.getMode(config, parserConfig.base),
+      {open: "{{", close: /\}\}\}?/, mode: handlebars, parseDelimiters: true}
+    );
+  });
+
+  CodeMirror.defineMIME("text/x-handlebars-template", "handlebars");
+});

package/public/cm_modes/htmlmixed.js

@@ -0,0 +1,153 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"), require("../css/css"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript", "../css/css"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var defaultTags = {
+    script: [
+      ["lang", /(javascript|babel)/i, "javascript"],
+      ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i, "javascript"],
+      ["type", /./, "text/plain"],
+      [null, null, "javascript"]
+    ],
+    style:  [
+      ["lang", /^css$/i, "css"],
+      ["type", /^(text\/)?(x-)?(stylesheet|css)$/i, "css"],
+      ["type", /./, "text/plain"],
+      [null, null, "css"]
+    ]
+  };
+
+  function maybeBackup(stream, pat, style) {
+    var cur = stream.current(), close = cur.search(pat);
+    if (close > -1) {
+      stream.backUp(cur.length - close);
+    } else if (cur.match(/<\/?$/)) {
+      stream.backUp(cur.length);
+      if (!stream.match(pat, false)) stream.match(cur);
+    }
+    return style;
+  }
+
+  var attrRegexpCache = {};
+  function getAttrRegexp(attr) {
+    var regexp = attrRegexpCache[attr];
+    if (regexp) return regexp;
+    return attrRegexpCache[attr] = new RegExp("\\s+" + attr + "\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*");
+  }
+
+  function getAttrValue(text, attr) {
+    var match = text.match(getAttrRegexp(attr))
+    return match ? /^\s*(.*?)\s*$/.exec(match[2])[1] : ""
+  }
+
+  function getTagRegexp(tagName, anchored) {
+    return new RegExp((anchored ? "^" : "") + "<\/\\s*" + tagName + "\\s*>", "i");
+  }
+
+  function addTags(from, to) {
+    for (var tag in from) {
+      var dest = to[tag] || (to[tag] = []);
+      var source = from[tag];
+      for (var i = source.length - 1; i >= 0; i--)
+        dest.unshift(source[i])
+    }
+  }
+
+  function findMatchingMode(tagInfo, tagText) {
+    for (var i = 0; i < tagInfo.length; i++) {
+      var spec = tagInfo[i];
+      if (!spec[0] || spec[1].test(getAttrValue(tagText, spec[0]))) return spec[2];
+    }
+  }
+
+  CodeMirror.defineMode("htmlmixed", function (config, parserConfig) {
+    var htmlMode = CodeMirror.getMode(config, {
+      name: "xml",
+      htmlMode: true,
+      multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
+      multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag,
+      allowMissingTagName: parserConfig.allowMissingTagName,
+    });
+
+    var tags = {};
+    var configTags = parserConfig && parserConfig.tags, configScript = parserConfig && parserConfig.scriptTypes;
+    addTags(defaultTags, tags);
+    if (configTags) addTags(configTags, tags);
+    if (configScript) for (var i = configScript.length - 1; i >= 0; i--)
+      tags.script.unshift(["type", configScript[i].matches, configScript[i].mode])
+
+    function html(stream, state) {
+      var style = htmlMode.token(stream, state.htmlState), tag = /\btag\b/.test(style), tagName
+      if (tag && !/[<>\s\/]/.test(stream.current()) &&
+          (tagName = state.htmlState.tagName && state.htmlState.tagName.toLowerCase()) &&
+          tags.hasOwnProperty(tagName)) {
+        state.inTag = tagName + " "
+      } else if (state.inTag && tag && />$/.test(stream.current())) {
+        var inTag = /^([\S]+) (.*)/.exec(state.inTag)
+        state.inTag = null
+        var modeSpec = stream.current() == ">" && findMatchingMode(tags[inTag[1]], inTag[2])
+        var mode = CodeMirror.getMode(config, modeSpec)
+        var endTagA = getTagRegexp(inTag[1], true), endTag = getTagRegexp(inTag[1], false);
+        state.token = function (stream, state) {
+          if (stream.match(endTagA, false)) {
+            state.token = html;
+            state.localState = state.localMode = null;
+            return null;
+          }
+          return maybeBackup(stream, endTag, state.localMode.token(stream, state.localState));
+        };
+        state.localMode = mode;
+        state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, "", ""));
+      } else if (state.inTag) {
+        state.inTag += stream.current()
+        if (stream.eol()) state.inTag += " "
+      }
+      return style;
+    };
+
+    return {
+      startState: function () {
+        var state = CodeMirror.startState(htmlMode);
+        return {token: html, inTag: null, localMode: null, localState: null, htmlState: state};
+      },
+
+      copyState: function (state) {
+        var local;
+        if (state.localState) {
+          local = CodeMirror.copyState(state.localMode, state.localState);
+        }
+        return {token: state.token, inTag: state.inTag,
+                localMode: state.localMode, localState: local,
+                htmlState: CodeMirror.copyState(htmlMode, state.htmlState)};
+      },
+
+      token: function (stream, state) {
+        return state.token(stream, state);
+      },
+
+      indent: function (state, textAfter, line) {
+        if (!state.localMode || /^\s*<\//.test(textAfter))
+          return htmlMode.indent(state.htmlState, textAfter, line);
+        else if (state.localMode.indent)
+          return state.localMode.indent(state.localState, textAfter, line);
+        else
+          return CodeMirror.Pass;
+      },
+
+      innerMode: function (state) {
+        return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode};
+      }
+    };
+  }, "xml", "javascript", "css");
+
+  CodeMirror.defineMIME("text/html", "htmlmixed");
+});

package/routes/admin.js

@@ -986,7 +986,7 @@ router.post(
         "npm",
         ["install", "-g", "@saltcorn/cli@latest", "--unsafe"],
         {
-          stdio: ["ignore", "pipe", process.stderr],
+          stdio: ["ignore", "pipe", "pipe"],
         }
       );
       child.stdout.on("data", (data) => {
@@ -1387,6 +1387,9 @@ router.get(
   error_catcher(async (req, res) => {
     const views = await View.find();
     const pages = await Page.find();
+    const images = (await File.find({ mime_super: "image" })).filter((image) =>
+      image.filename?.endsWith(".png")
+    );
 
     send_admin_page({
       res,
@@ -1464,7 +1467,7 @@ router.get(
                       // select entry-view
                       select(
                         {
-                          class: "form-control",
+                          class: "form-select",
                           name: "entryPoint",
                           id: "viewInputID",
                         },
@@ -1477,14 +1480,14 @@ router.get(
                       // select entry-page
                       select(
                         {
-                          class: "form-control d-none",
+                          class: "form-select d-none",
                           id: "pageInputID",
                         },
                         pages
                           .map((page) =>
                             option({ value: page.name }, page.name)
                           )
-                          .join(",")
+                          .join("")
                       )
                     ),
                     div(
@@ -1530,28 +1533,51 @@ router.get(
                       })
                     )
                   ),
+                  // app name
                   div(
                     { class: "row pb-2" },
                     div(
                       { class: "col-sm-8" },
                       label(
                         {
-                          for: "appNameInputId",
+                          for: "appFileInputId",
                           class: "form-label fw-bold",
                         },
-                        req.__("App file")
+                        req.__("App name")
                       ),
                       input({
                         type: "text",
                         class: "form-control",
-                        name: "appFile",
-                        id: "appFileInputId",
-                        placeholder: "app-debug",
+                        name: "appName",
+                        id: "appNameInputId",
+                        placeholder: "SaltcornMobileApp",
                       })
                     )
                   ),
+                  // app version
                   div(
-                    { class: "row pb-3" },
+                    { class: "row pb-2" },
+                    div(
+                      { class: "col-sm-8" },
+                      label(
+                        {
+                          for: "appVersionInputId",
+                          class: "form-label fw-bold",
+                        },
+                        req.__("App version")
+                      ),
+                      input({
+                        type: "text",
+                        class: "form-control",
+                        name: "appVersion",
+                        id: "appVersionInputId",
+                        placeholder: "1.0.0",
+                      })
+                    )
+                  ),
+                  // server url
+                  div(
+                    { class: "row pb-2" },
                     div(
                       { class: "col-sm-8" },
                       label(
@@ -1570,6 +1596,60 @@ router.get(
                       })
                     )
                   ),
+                  // app icon
+                  div(
+                    { class: "row pb-2" },
+                    div(
+                      { class: "col-sm-8" },
+                      label(
+                        {
+                          for: "appIconInputId",
+                          class: "form-label fw-bold",
+                        },
+                        req.__("App icon")
+                      ),
+                      select(
+                        {
+                          class: "form-select",
+                          name: "appIcon",
+                          id: "appIconInputId",
+                        },
+                        [
+                          option({ value: "" }, ""),
+                          ...images.map((image) =>
+                            option({ value: image.location }, image.filename)
+                          ),
+                        ].join("")
+                      )
+                    )
+                  ),
+                  div(
+                    { class: "row pb-3" },
+                    div(
+                      { class: "col-sm-8" },
+                      label(
+                        {
+                          for: "splashPageInputId",
+                          class: "form-label fw-bold",
+                        },
+                        req.__("Splash Page")
+                      ),
+                      select(
+                        {
+                          class: "form-select",
+                          name: "splashPage",
+                          id: "splashPageInputId",
+                        },
+                        [
+                          option({ value: "" }, ""),
+                          ...pages.map((page) =>
+                            option({ value: page.name }, page.name)
+                          ),
+                        ].join("")
+                      )
+                    )
+                  ),
+
                   div(
                     // TODO only for some tables?
                     { class: "row pb-2" },
@@ -1688,8 +1768,11 @@ router.post(
       androidPlatform,
       iOSPlatform,
       useDocker,
-      appFile,
+      appName,
+      appVersion,
+      appIcon,
       serverURL,
+      splashPage,
       allowOfflineMode,
     } = req.body;
     if (!androidPlatform && !iOSPlatform) {
@@ -1736,8 +1819,11 @@ router.post(
         spawnParams.push("--buildForEmulator");
       }
     }
-    if (appFile) spawnParams.push("-a", appFile);
+    if (appName) spawnParams.push("--appName", appName);
+    if (appVersion) spawnParams.push("--appVersion", appVersion);
+    if (appIcon) spawnParams.push("--appIcon", appIcon);
     if (serverURL) spawnParams.push("-s", serverURL);
+    if (splashPage) spawnParams.push("--splashPage", splashPage);
     if (allowOfflineMode) spawnParams.push("--allowOfflineMode");
     if (
       db.is_it_multi_tenant() &&

package/routes/tables.js

@@ -11,6 +11,7 @@ const Table = require("@saltcorn/data/models/table");
 const File = require("@saltcorn/data/models/file");
 const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
+const Trigger = require("@saltcorn/data/models/trigger");
 const {
   mkTable,
   renderForm,
@@ -579,6 +580,7 @@ router.get(
     const inbound_refs = [
       ...new Set(child_relations.map(({ table }) => table.name)),
     ];
+    const triggers = table.id ? Trigger.find({ table_id: table.id }) : [];
     let fieldCard;
     if (fields.length === 0) {
       fieldCard = [
@@ -647,6 +649,13 @@ router.get(
             inbound_refs.map((tnm) => link(`/table/${tnm}`, tnm)).join(", ") +
             "<br>"
           : "",
+        triggers.length
+          ? req.__("Table triggers: ") +
+            triggers
+              .map((t) => link(`/actions/configure/${t.id}`, t.name))
+              .join(", ") +
+            "<br>"
+          : "",
         !table.external &&
           a(
             {

package/s3storage.js

@@ -1,3 +1,4 @@
+require("aws-sdk/lib/maintenance_mode_message").suppress = true;
 const aws = require("aws-sdk");
 const multer = require("multer");
 const multerS3 = require("multer-s3");

package/serve.js

@@ -8,6 +8,7 @@ const runScheduler = require("@saltcorn/data/models/scheduler");
 const User = require("@saltcorn/data/models/user");
 const Plugin = require("@saltcorn/data/models/plugin");
 const db = require("@saltcorn/data/db");
+const { getConfigFile, configFilePath } = require("@saltcorn/data/db/connect");
 const {
   getState,
   init_multi_tenant,
@@ -49,11 +50,33 @@ const {
 } = require("@saltcorn/admin-models/models/tenant");
 const { auto_backup_now } = require("@saltcorn/admin-models/models/backup");
 const Snapshot = require("@saltcorn/admin-models/models/snapshot");
+const { writeFileSync } = require("fs");
 
 const take_snapshot = async () => {
   return await Snapshot.take_if_changed();
 };
 
+/**
+ * Ensure the cfg file has a jwt_secret
+ */
+const ensureJwtSecret = () => {
+  const cfg = getConfigFile();
+  if (cfg && !cfg.jwt_secret) {
+    try {
+      const newSecret = require("crypto").randomBytes(64).toString("hex");
+      cfg.jwt_secret = newSecret;
+      writeFileSync(configFilePath, JSON.stringify(cfg, null, 2));
+      db.connectObj.jwt_secret = newSecret;
+    } catch (error) {
+      console.log(
+        `Unable to set a jwt_secret: ${
+          error.message ? error.message : "Unknown error"
+        }`
+      );
+    }
+  }
+};
+
 // helpful https://gist.github.com/jpoehls/2232358
 /**
  * @param {object} opts
@@ -195,6 +218,7 @@ module.exports =
     dev,
     ...appargs
   } = {}) => {
+    ensureJwtSecret();
     process.on("unhandledRejection", (reason, p) => {
       console.error(reason, "Unhandled Rejection at Promise");
     });