@saltcorn/server 1.0.0-beta.10 → 1.0.0-beta.13

package/load_plugins.js

@@ -51,7 +51,7 @@ const ensurePluginSupport = async (plugin) => {
  * @param force - force flag
  */
 const loadPlugin = async (plugin, force) => {
-  if (plugin.source === "npm") {
+  if (plugin.source === "npm" && isRoot()) {
     try {
       await ensurePluginSupport(plugin);
     } catch (e) {

package/package.json

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

package/public/saltcorn-common.js

@@ -63,14 +63,20 @@ function reset_nearest_form(that) {
 
 function add_repeater(nm) {
   var es = $("div.form-repeat.repeat-" + nm);
-  var e = es.first();
+  const ncopy = es.length - 1;
+  var e = es.last();
   var newix = es.length;
   var newe = $(e).clone();
   newe.find("[name]").each(function (ix, element) {
     if ($(element).hasClass("omit-repeater-clone")) $(element).remove();
-    var newnm = (element.name || "").replace("_0", "_" + newix);
-    var newid = (element.id || "").replace("_0", "_" + newix);
+    const oldnm = element.name || "";
+    var newnm = (element.name || "").replace("_" + ncopy, "_" + newix);
+    var newid = (element.id || "").replace("_" + ncopy, "_" + newix);
     $(element).attr("name", newnm).attr("id", newid);
+    if (element.tagName === "SELECT") {
+      const original = document.getElementsByName(oldnm)[0];
+      if (original) element.selectedIndex = original.selectedIndex;
+    }
   });
   newe.appendTo($("div.repeats-" + nm));
   newe.find("[data-on-cloned]").each(function (ix, element) {
@@ -80,6 +86,27 @@ function add_repeater(nm) {
   });
 }
 
+function rep_del(e) {
+  var myrep = $(e).closest(".form-repeat");
+  var ix = myrep.index();
+  var parent = myrep.parent();
+  myrep.remove();
+  parent.children().each(function (childix, element) {
+    if (childix > ix) {
+      reindex(element, childix, childix - 1);
+    }
+  });
+}
+
+function reindex(element, oldix, newix) {
+  $(element).html(
+    $(element)
+      .html()
+      .split("_" + oldix + '"')
+      .join("_" + newix + '"')
+  );
+}
+
 const _apply_showif_plugins = [];
 
 const add_apply_showif_plugin = (p) => {
@@ -115,16 +142,18 @@ function apply_showif() {
       }
       if (!e.data("data-closest-form-ns"))
         e.data("data-closest-form-ns", e.closest(".form-namespace"));
-      if (to_show(e))
-        e.show()
-          .find("input, textarea, button, select, [data-show-if]")
-          .prop("disabled", e.attr("data-disabled") || false);
-      else
-        e.hide()
-          .find(
-            "input:enabled, textarea:enabled, button:enabled, select:enabled, [data-show-if]:not([disabled])"
-          )
-          .prop("disabled", true);
+      if (to_show(e)) {
+        e.find("input, textarea, button, select, [data-show-if]").prop(
+          "disabled",
+          e.attr("data-disabled") || false
+        );
+        element.style.display = "";
+      } else {
+        e.find(
+          "input:enabled, textarea:enabled, button:enabled, select:enabled, [data-show-if]:not([disabled])"
+        ).prop("disabled", true);
+        element.style.setProperty("display", "none", "important");
+      }
     } catch (e) {
       console.error(e);
     }
@@ -561,27 +590,6 @@ function showIfFormulaInputs(e, fml) {
   }
 }
 
-function rep_del(e) {
-  var myrep = $(e).closest(".form-repeat");
-  var ix = myrep.index();
-  var parent = myrep.parent();
-  parent.children().each(function (childix, element) {
-    if (childix > ix) {
-      reindex(element, childix, childix - 1);
-    }
-  });
-  myrep.remove();
-}
-
-function reindex(element, oldix, newix) {
-  $(element).html(
-    $(element)
-      .html()
-      .split("_" + oldix)
-      .join("_" + newix)
-  );
-}
-
 function get_form_subset_record(e) {
   const rec = {};
   e.find("input[name],select[name]").each(function () {

package/routes/scapi.js

@@ -25,6 +25,7 @@ const {
   stateFieldsToWhere,
   readState,
 } = require("@saltcorn/data/plugin-helper");
+const { getState } = require("@saltcorn/data/db/state");
 
 /**
  * @type {object}
@@ -307,3 +308,21 @@ router.get(
     )(req, res, next);
   })
 );
+
+router.get(
+  "/reload",
+  error_catcher(async (req, res, next) => {
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedRead(req, user)) {
+          await getState().refresh_plugins();
+          res.json({ success: true });
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
+);