@saltcorn/server 1.1.0-beta.12 → 1.1.0-beta.13

package/load_plugins.js

@@ -97,7 +97,10 @@ const loadPlugin = async (plugin, force, forceFetch) => {
     }
   }
   // load plugin
-  const loader = new PluginInstaller(plugin);
+  const loader = new PluginInstaller(plugin, {
+    scVersion: packagejson.version,
+    envVars: { PUPPETEER_SKIP_DOWNLOAD: true },
+  });
   const res = await loader.install(force);
   const configuration =
     typeof plugin.configuration === "string"
@@ -162,7 +165,10 @@ const reloadAuthFromRoot = () => {
  * @returns {Promise<{plugin_module: *}|{plugin_module: any}>}
  */
 const requirePlugin = async (plugin, force) => {
-  const loader = new PluginInstaller(plugin);
+  const loader = new PluginInstaller(plugin, {
+    scVersion: packagejson.version,
+    envVars: { PUPPETEER_SKIP_DOWNLOAD: true },
+  });
   return await loader.install(force);
 };
 
@@ -231,7 +237,7 @@ const loadAndSaveNewPlugin = async (
   const loadMsgs = [];
   const loader = new PluginInstaller(plugin, {
     scVersion: packagejson.version,
-    envVars: { PUPPETEER_SKIP_DOWNLOAD: "1" },
+    envVars: { PUPPETEER_SKIP_DOWNLOAD: true },
   });
   const { version, plugin_module, location, loadedWithReload, msgs } =
     await loader.install(force);

package/locales/en.json

@@ -1497,5 +1497,7 @@
 	"Capacitor builder": "Capacitor builder",
 	"Pulling the capacitor-builder docker image...": "Pulling the capacitor-builder docker image...",
 	"Pull done with code %s": "Pull done with code %s",
-	"Default locale": "Default locale"
+	"Default locale": "Default locale",
+	"Confirm leaving unsaved": "Confirm leaving unsaved",
+	"Ask the user to confirm if they close a tab with unsaved changes": "Ask the user to confirm if they close a tab with unsaved changes"
 }

package/package.json

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

package/public/saltcorn.js

@@ -460,6 +460,7 @@ function saveAndContinue(e, k, event) {
     data: form_data,
     success: function (res) {
       ajax_indicator(false);
+      form.removeAttr("data-unsaved-changes");
       form.parent().find(".full-form-error").text("");
       if (res.id && form.find("input[name=id")) {
         form.append(
@@ -1189,6 +1190,14 @@ function installPWA() {
   }
 }
 
+function check_unsaved_form(event, script_tag) {
+  const form = $(script_tag).parent().find("form");
+  if (form.attr("data-unsaved-changes")) {
+    event.preventDefault();
+    event.returnValue = true;
+  }
+}
+
 (() => {
   const e = document.querySelector("[data-sidebar-toggler]");
   let closed = localStorage.getItem("sidebarClosed") === "true";

package/routes/fields.js

@@ -362,10 +362,12 @@ const fieldFlow = (req) =>
         name: req.__("Attributes"),
         contextField: "attributes",
         onlyWhen: (context) => {
-          if (context.calculated) return false;
+          const type = getState().types[context.type];
+          if (context.calculated && !type?.setTypeAttributesForCalculatedFields)
+            return false;
+
           if (context.type === "File") return true;
           if (new Field(context).is_fkey) return false;
-          const type = getState().types[context.type];
           if (!type) return false;
           const attrs = Field.getTypeAttributes(
             type.attributes,

package/serve.js

@@ -121,11 +121,7 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
   if (getState().getConfig("log_sql", false)) db.set_sql_logging();
   if (db.is_it_multi_tenant()) {
     const tenants = await getAllTenants();
-    await init_multi_tenant(
-      async () => await loadAllPlugins(true),
-      disableMigrate,
-      tenants
-    );
+    await init_multi_tenant(loadAllPlugins, disableMigrate, tenants);
   }
   eachTenant(async () => {
     const state = getState();