@saltcorn/server 0.8.6-beta.9 → 0.8.7-beta.0

package/auth/admin.js

@@ -54,7 +54,7 @@ module.exports = router;
  * @returns {Promise<object>}
  */
 const getUserFields = async (req) => {
-  const userTable = await Table.findOne({ name: "users" });
+  const userTable = Table.findOne({ name: "users" });
   const userFields = (await userTable.getFields()).filter(
     (f) => !f.calculated && f.name !== "id"
   );
@@ -795,7 +795,7 @@ router.get(
     const contents = [];
     for (const table of tables) {
       if (table.external) continue;
-      const fields = await table.getFields();
+      const fields = table.getFields();
       const ownership_opts = await table.ownership_options();
       const form = new Form({
         action: "/table",

package/auth/routes.js

@@ -467,7 +467,7 @@ const default_signup_form = async (req) => {
   const form = loginForm(req, true);
   const new_user_form = getState().getConfig("new_user_form", "");
   if (!new_user_form) {
-    const userTable = await Table.findOne({ name: "users" });
+    const userTable = Table.findOne({ name: "users" });
     const userFields = await userTable.getFields();
 
     for (const f of userFields) {
@@ -631,8 +631,8 @@ const getNewUserForm = async (new_user_view_name, req, askEmail) => {
   const view = await View.findOne({ name: new_user_view_name });
   if (!view)
     throw new InvalidConfiguration("New user form view does not exist");
-  const table = await Table.findOne({ name: "users" });
-  const fields = await table.getFields();
+  const table = Table.findOne({ name: "users" });
+  const fields = table.getFields();
   const { columns, layout } = view.configuration;
 
   const tfields = (columns || [])
@@ -776,8 +776,8 @@ router.post(
 
       signup_login_with_user(u, req, res);
     } catch (e) {
-      const table = await Table.findOne({ name: "users" });
-      const fields = await table.getFields();
+      const table = Table.findOne({ name: "users" });
+      const fields = table.getFields();
       form.hasErrors = true;
       const unique_field_error = fields.find(
         (f) =>
@@ -833,8 +833,8 @@ router.post(
 
           signup_login_with_user(u, req, res);
         } catch (e) {
-          const table = await Table.findOne({ name: "users" });
-          const fields = await table.getFields();
+          const table = Table.findOne({ name: "users" });
+          const fields = table.getFields();
           form.hasErrors = true;
           const unique_field_error = fields.find(
             (f) =>

package/load_plugins.js

@@ -209,13 +209,14 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB) => {
     }
   }
   if (version) plugin.version = version;
-  if (!noSignalOrDB) await plugin.upsert();
-  if (!noSignalOrDB && process.send)
-    process.send({
+  if (!noSignalOrDB) {
+    await plugin.upsert();
+    getState().processSend({
       installPlugin: plugin,
       tenant: db.getTenantSchema(),
       force,
     });
+  }
 };
 
 module.exports = {

package/locales/en.json

@@ -1167,5 +1167,11 @@
 	"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",
+	"Forgot password?": "Forgot password?"
 }

package/markup/admin.js

@@ -328,7 +328,7 @@ const send_admin_page = (args) => {
  */
 const viewAttributes = async (key) => {
   const [v, table_name] = configTypes[key].type.split(" ");
-  const table = await Table.findOne({ name: table_name });
+  const table = Table.findOne({ name: table_name });
   const views = await View.find({ table_id: table.id });
   return {
     options: views.map((v) => {

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.6-beta.9",
+  "version": "0.8.7-beta.0",
   "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.9",
-    "@saltcorn/builder": "0.8.6-beta.9",
-    "@saltcorn/data": "0.8.6-beta.9",
-    "@saltcorn/admin-models": "0.8.6-beta.9",
-    "@saltcorn/filemanager": "0.8.6-beta.9",
-    "@saltcorn/markup": "0.8.6-beta.9",
-    "@saltcorn/sbadmin2": "0.8.6-beta.9",
+    "@saltcorn/base-plugin": "0.8.7-beta.0",
+    "@saltcorn/builder": "0.8.7-beta.0",
+    "@saltcorn/data": "0.8.7-beta.0",
+    "@saltcorn/admin-models": "0.8.7-beta.0",
+    "@saltcorn/filemanager": "0.8.7-beta.0",
+    "@saltcorn/markup": "0.8.7-beta.0",
+    "@saltcorn/sbadmin2": "0.8.7-beta.0",
     "@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/actions.js

@@ -171,6 +171,13 @@ const triggerForm = async (req, trigger) => {
         required: true,
         options: Trigger.when_options.map((t) => ({ value: t, label: t })),
         sublabel: req.__("Event type which runs the trigger"),
+        attributes: {
+          explainers: {
+            Often: "Every 5 minutes",
+            Never:
+              "Not scheduled but can be run as an action from a button click",
+          },
+        },
       },
       {
         name: "table_id",
@@ -457,7 +464,7 @@ router.get(
     } else {
       // get table related to trigger
       const table = trigger.table_id
-        ? await Table.findOne({ id: trigger.table_id })
+        ? Table.findOne({ id: trigger.table_id })
         : null;
       // get configuration fields
       const cfgFields = await getActionConfigFields(action, table);
@@ -502,7 +509,7 @@ router.post(
     const trigger = await Trigger.findOne({ id });
     const action = getState().actions[trigger.action];
     const table = trigger.table_id
-      ? await Table.findOne({ id: trigger.table_id })
+      ? Table.findOne({ id: trigger.table_id })
       : null;
     const cfgFields = await getActionConfigFields(action, table);
     const form = new Form({
@@ -588,7 +595,7 @@ router.get(
     };
     let table, row;
     if (trigger.table_id) {
-      table = await Table.findOne({ id: trigger.table_id });
+      table = Table.findOne({ id: trigger.table_id });
       row = await table.getRow({});
     }
     try {

package/routes/admin.js

@@ -954,12 +954,14 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     if (db.getTenantSchema() === db.connectObj.default_schema) {
-      if (process.send) process.send("RestartServer");
+      if (process.send) getState().processSend("RestartServer");
       else process.exit(0);
     } else {
       await restart_tenant(loadAllPlugins);
-      process.send &&
-        process.send({ restart_tenant: true, tenant: db.getTenantSchema() });
+      getState().processSend({
+        restart_tenant: true,
+        tenant: db.getTenantSchema(),
+      });
       req.flash("success", req.__("Restart complete"));
       res.redirect("/admin");
     }
@@ -984,13 +986,13 @@ router.post(
         "npm",
         ["install", "-g", "@saltcorn/cli@latest", "--unsafe"],
         {
-          stdio: ["ignore", "pipe", process.stderr],
+          stdio: ["ignore", "pipe", "pipe"],
         }
       );
       child.stdout.on("data", (data) => {
         res.write(data);
       });
-      child.stderr.on("data", (data) => {
+      child.stderr?.on("data", (data) => {
         res.write(data);
       });
       child.on("exit", function (code, signal) {
@@ -1000,7 +1002,7 @@ router.post(
           )
         );
         setTimeout(() => {
-          if (process.send) process.send("RestartServer");
+          getState().processSend("RestartServer");
           process.exit(0);
         }, 100);
       });
@@ -1385,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,
@@ -1462,7 +1467,7 @@ router.get(
                       // select entry-view
                       select(
                         {
-                          class: "form-control",
+                          class: "form-select",
                           name: "entryPoint",
                           id: "viewInputID",
                         },
@@ -1475,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(
@@ -1528,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(
@@ -1568,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" },
@@ -1686,8 +1768,11 @@ router.post(
       androidPlatform,
       iOSPlatform,
       useDocker,
-      appFile,
+      appName,
+      appVersion,
+      appIcon,
       serverURL,
+      splashPage,
       allowOfflineMode,
     } = req.body;
     if (!androidPlatform && !iOSPlatform) {
@@ -1734,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() &&
@@ -1816,7 +1904,7 @@ router.post(
       await View.delete({});
     }
     //user fields
-    const users = await Table.findOne({ name: "users" });
+    const users = Table.findOne({ name: "users" });
     const userfields = await users.getFields();
     for (const f of userfields) {
       if (f.is_fkey) {
@@ -1837,7 +1925,7 @@ router.post(
           table_id: table.id,
         });
         await table.update({ ownership_field_id: null });
-        const fields = await table.getFields();
+        const fields = table.getFields();
         for (const f of fields) {
           if (f.is_fkey) {
             await f.delete();
@@ -1880,14 +1968,16 @@ router.post(
       await getState().refresh();
     }
     if (form.values.users) {
-      const users1 = await Table.findOne({ name: "users" });
+      const users1 = Table.findOne({ name: "users" });
       const userfields1 = await users1.getFields();
 
       for (const f of userfields1) {
         if (f.name !== "email" && f.name !== "id") await f.delete();
       }
       await db.deleteWhere("users");
-      await db.deleteWhere("_sc_roles", { not: { id: { in: [1, 4, 8, 10] } } });
+      await db.deleteWhere("_sc_roles", {
+        not: { id: { in: [1, 40, 80, 100] } },
+      });
       if (db.reset_sequence) await db.reset_sequence("users");
       req.logout(function (err) {
         if (req.session.destroy)