@saltcorn/server 0.5.4-beta.1 → 0.5.5

package/load_plugins.js

@@ -54,7 +54,7 @@ const loadPlugin = async (plugin, force) => {
   const res = await requirePlugin(plugin, force);
   // register plugin
   getState().registerPlugin(
-    plugin.name,
+    res.plugin_module.plugin_name || plugin.name,
     res.plugin_module,
     plugin.configuration,
     res.location
@@ -176,7 +176,12 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB) => {
       );
     }
   }
-  getState().registerPlugin(plugin.name, plugin_module, undefined, location);
+  getState().registerPlugin(
+    plugin_module.plugin_name || plugin.name,
+    plugin_module,
+    undefined,
+    location
+  );
   if (plugin_module.onLoad) {
     try {
       await plugin_module.onLoad(plugin.configuration);
@@ -187,7 +192,11 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB) => {
   if (version) plugin.version = version;
   if (!noSignalOrDB) await plugin.upsert();
   if (!noSignalOrDB && process.send)
-    process.send({ installPlugin: plugin, tenant: db.getTenantSchema(), force });
+    process.send({
+      installPlugin: plugin,
+      tenant: db.getTenantSchema(),
+      force,
+    });
 };
 
 module.exports = {

package/locales/en.json

@@ -781,5 +781,7 @@
 	"Show older messages": "Show older messages",
 	"New table name": "New table name",
 	"Password Repeat": "Password Repeat",
-	"Remember me": "Remember me"
+	"Remember me": "Remember me",
+	"Column width": "Column width",
+	"Column width units": "Column width units"
 }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.5.4-beta.1",
+  "version": "0.5.5",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.5.4-beta.1",
-    "@saltcorn/builder": "0.5.4-beta.1",
-    "@saltcorn/data": "0.5.4-beta.1",
+    "@saltcorn/base-plugin": "0.5.5",
+    "@saltcorn/builder": "0.5.5",
+    "@saltcorn/data": "0.5.5",
     "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.5.4-beta.1",
-    "@saltcorn/sbadmin2": "0.5.4-beta.1",
+    "@saltcorn/markup": "0.5.5",
+    "@saltcorn/sbadmin2": "0.5.5",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",
@@ -30,7 +30,7 @@
     "greenlock": "^4.0.4",
     "helmet": "^3.23.3",
     "i18n": "^0.13.2",
-    "live-plugin-manager": "^0.15.1",
+    "live-plugin-manager": "^0.16.0",
     "moment": "^2.27.0",
     "node-fetch": "^2.6.1",
     "passport": "^0.4.1",
@@ -38,7 +38,7 @@
     "passport-http-bearer": "^1.0.1",
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
-    "socket.io": "4.1.3",
+    "socket.io": "4.2.0",
     "tmp-promise": "^3.0.2"
   },
   "optionalDependencies": {

package/public/saltcorn.css

@@ -284,3 +284,6 @@ button.btnstylesel {
 .ml-m1 {
   margin-left: -1rem;
 }
+table.table-layout-fixed {
+  table-layout: fixed;
+}

package/public/saltcorn.js

@@ -106,28 +106,70 @@ function reindex(element, oldix, newix) {
   );
 }
 
+function get_form_subset_record(e) {
+  const rec = {};
+  e.find("input[name],select[name]").each(function () {
+    rec[$(this).attr("name")] = $(this).val();
+  });
+  return rec;
+}
+
+function apply_form_subset_record(e, vals) {
+  e.find("input[name],select[name]").each(function () {
+    var name = $(this).attr("name");
+    if (vals[name]) $(this).val(vals[name]);
+  });
+}
+
+function reindex_form_record(vals, oldix, newix) {
+  const rec = {};
+  Object.keys(vals).forEach((k) => {
+    const newkey = k.split("_" + oldix).join("_" + newix);
+    rec[newkey] = vals[k];
+  });
+  return rec;
+}
+
 function rep_up(e) {
   var myrep = $(e).closest(".form-repeat");
+  var theform = $(e).closest("form");
   var ix = myrep.index();
   var parent = myrep.parent();
   if (ix > 0) {
     var swap_with = parent.children(".form-repeat").eq(ix - 1);
+    var vals1 = reindex_form_record(get_form_subset_record(myrep), ix, ix - 1);
+    var vals2 = reindex_form_record(
+      get_form_subset_record(swap_with),
+      ix - 1,
+      ix
+    );
     reindex(myrep, ix, ix - 1);
     reindex(swap_with, ix - 1, ix);
     $(myrep).swapWith(swap_with);
+    apply_form_subset_record(theform, vals2);
+    apply_form_subset_record(theform, vals1);
   }
 }
 
 function rep_down(e) {
   var myrep = $(e).closest(".form-repeat");
+  var theform = $(e).closest("form");
   var ix = myrep.index();
   var parent = myrep.parent();
   var nchildren = parent.children(".form-repeat").length;
   if (ix < nchildren - 1) {
     var swap_with = parent.children(".form-repeat").eq(ix + 1);
+    var vals1 = reindex_form_record(get_form_subset_record(myrep), ix, ix + 1);
+    var vals2 = reindex_form_record(
+      get_form_subset_record(swap_with),
+      ix + 1,
+      ix
+    );
     reindex(myrep, ix, ix + 1);
     reindex(swap_with, ix + 1, ix);
     $(myrep).swapWith(swap_with);
+    apply_form_subset_record(theform, vals2);
+    apply_form_subset_record(theform, vals1);
   }
 }
 function initialize_page() {

package/routes/actions.js

@@ -41,6 +41,7 @@ const {
   td,
   h6,
   pre,
+  text,
   hr,
 } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
@@ -557,11 +558,17 @@ router.get(
     const output = [];
     const fakeConsole = {
       log(...s) {
-        output.push(div(code(s.join(" "))));
+        console.log(...s);
+        output.push(div(code(pre(text(s.join(" "))))));
       },
       error(...s) {
         output.push(
-          div(code({ style: "color:red;font-weight:bold;" }, s.join(" ")))
+          div(
+            code(
+              { style: "color:red;font-weight:bold;" },
+              pre(text(s.join(" ")))
+            )
+          )
         );
       },
     };

package/routes/plugins.js

@@ -529,16 +529,18 @@ router.get(
   })
 );
 router.get(
-  "/public/:plugin/:file",
+  "/public/:plugin/*",
   setTenant,
   error_catcher(async (req, res) => {
-    const { plugin, file } = req.params;
-
+    const { plugin } = req.params;
+    const filepath = req.params[0];
     const location = getState().plugin_locations[plugin];
     if (location) {
-      const safeFile = path.normalize(file).replace(/^(\.\.(\/|\\|$))+/, "");
+      const safeFile = path
+        .normalize(filepath)
+        .replace(/^(\.\.(\/|\\|$))+/, "");
       const fullpath = path.join(location, "public", safeFile);
-      if (fs.existsSync(fullpath)) res.sendFile(fullpath, { maxAge: "1h" });
+      if (fs.existsSync(fullpath)) res.sendFile(fullpath, { maxAge: "1d" });
       else res.status(404).send(req.__("Not found"));
     } else {
       res.status(404).send(req.__("Not found"));

package/serve.js

@@ -120,7 +120,7 @@ module.exports = async ({
     ? +process.env.SALTCORN_NWORKERS
     : defaultNCPUs;
 
-  const letsEncrypt = getConfig("letsencrypt", false);
+  const letsEncrypt = await getConfig("letsencrypt", false);
   const masterState = {
     started: false,
     listeningTo: new Set([]),

package/wrapper.js

@@ -245,6 +245,11 @@ module.exports = (version_tag) =>
         const renderToHtml = layout.renderBody
           ? (h, role) => layout.renderBody({ title, body: h, role, alerts })
           : defaultRenderToHtml;
+        res.header(
+          "Cache-Control",
+          "private, no-cache, no-store, must-revalidate"
+        );
+
         res.set("Page-Title", encodeURIComponent(title));
         res.send(
           html.length === 1
@@ -256,6 +261,7 @@ module.exports = (version_tag) =>
       const currentUrl = req.originalUrl.split("?")[0];
 
       const pageHeaders = typeof opts === "string" ? [] : opts.headers;
+
       res.send(
         layout.wrap({
           title,