@saltcorn/server 0.9.5-beta.7 → 0.9.5-beta.9

package/errors.js

@@ -37,6 +37,7 @@ module.exports =
     const createCrash = severity <= 3;
     //console.error(err.stack);
     if (!(devmode && log_sql) && createCrash) await Crash.create(err, req);
+    else console.error(err);
 
     if (req.xhr) {
       res

package/load_plugins.js

@@ -25,14 +25,29 @@ const loadPlugin = async (plugin, force) => {
     typeof plugin.configuration === "string"
       ? JSON.parse(plugin.configuration)
       : plugin.configuration;
-  // register plugin
-  getState().registerPlugin(
-    res.plugin_module.plugin_name || plugin.name,
-    res.plugin_module,
-    configuration,
-    res.location,
-    res.name
-  );
+  try {
+    // register plugin
+    getState().registerPlugin(
+      res.plugin_module.plugin_name || plugin.name,
+      res.plugin_module,
+      configuration,
+      res.location,
+      res.name
+    );
+  } catch (error) {
+    if (force) {
+      // remove the install dir and try again
+      await loader.remove();
+      await loader.install(force);
+      getState().registerPlugin(
+        res.plugin_module.plugin_name || plugin.name,
+        res.plugin_module,
+        configuration,
+        res.location,
+        res.name
+      );
+    }
+  }
   if (res.plugin_module.onLoad) {
     try {
       await res.plugin_module.onLoad(plugin.configuration);
@@ -76,9 +91,15 @@ const loadAllPlugins = async (force) => {
  * @param plugin
  * @param force
  * @param noSignalOrDB
+ * @param __ translation function
  * @returns {Promise<void>}
  */
-const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB) => {
+const loadAndSaveNewPlugin = async (
+  plugin,
+  force,
+  noSignalOrDB,
+  __ = (str) => str
+) => {
   const tenants_unsafe_plugins = getRootState().getConfig(
     "tenants_unsafe_plugins",
     false
@@ -104,8 +125,10 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB) => {
       return;
     }
   }
+  const msgs = [];
   const loader = new PluginInstaller(plugin);
-  const { version, plugin_module, location } = await loader.install(force);
+  const { version, plugin_module, location, loadedWithReload } =
+    await loader.install(force);
 
   // install dependecies
   for (const loc of plugin_module.dependencies || []) {
@@ -118,13 +141,43 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB) => {
       );
     }
   }
-  getState().registerPlugin(
-    plugin_module.plugin_name || plugin.name,
-    plugin_module,
-    plugin.configuration,
-    location,
-    plugin.name
-  );
+  let registeredWithReload = false;
+  try {
+    getState().registerPlugin(
+      plugin_module.plugin_name || plugin.name,
+      plugin_module,
+      plugin.configuration,
+      location,
+      plugin.name
+    );
+  } catch (error) {
+    if (force) {
+      getState().log(
+        2,
+        `Error registering plugin ${plugin.name}. Removing and trying again.`
+      );
+      await loader.remove();
+      await loader.install(force);
+      getState().registerPlugin(
+        plugin_module.plugin_name || plugin.name,
+        plugin_module,
+        plugin.configuration,
+        location,
+        plugin.name
+      );
+      registeredWithReload = true;
+    } else {
+      throw error;
+    }
+  }
+  if (loadedWithReload || registeredWithReload) {
+    msgs.push(
+      __(
+        "The plugin was corrupted and had to be repaired. We recommend restarting your server.",
+        plugin.name
+      )
+    );
+  }
   if (plugin_module.onLoad) {
     try {
       await plugin_module.onLoad(plugin.configuration);
@@ -141,6 +194,7 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB) => {
       force: false, // okay ??
     });
   }
+  return msgs;
 };
 
 module.exports = {

package/locales/en.json

@@ -1389,5 +1389,7 @@
 	"not available": "not available",
 	"pull": "pull",
 	"refresh": "refresh",
-	"installed": "installed"
-}
+	"installed": "installed",
+	"Include table history in backup": "Include table history in backup",
+	"The plugin was corrupted and had to be repaired. We recommend restarting your server.": "The plugin was corrupted and had to be repaired. We recommend restarting your server."
+}

package/package.json

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

package/public/saltcorn.js

@@ -549,10 +549,12 @@ function updateViewPreview() {
       },
 
       error: function (resp) {
-        $("#viewcfg-preview-error").html(resp.responseText || resp.statusText);
+        $("#viewcfg-preview-error")
+          .show()
+          .html(resp.responseText || resp.statusText);
       },
       success: function (res) {
-        $("#viewcfg-preview-error").html("");
+        $("#viewcfg-preview-error").hide().html("");
         $preview.css({ opacity: 1.0 });
 
         //disable functions preview migght try to call

package/routes/admin.js

@@ -274,6 +274,8 @@ router.get(
     const aBackupFilePrefixForm = backupFilePrefixForm(req);
     aBackupFilePrefixForm.values.backup_file_prefix =
       getState().getConfig("backup_file_prefix");
+    aBackupFilePrefixForm.values.backup_history =
+      getState().getConfig("backup_history");
     //
     const backupForm = autoBackupForm(req);
     backupForm.values.auto_backup_frequency = getState().getConfig(
@@ -674,6 +676,13 @@ const backupFilePrefixForm = (req) =>
         sublabel: req.__("Backup file prefix"),
         default: "sc-backup-",
       },
+      {
+        type: "Bool",
+        label: req.__("History"),
+        name: "backup_history",
+        sublabel: req.__("Include table history in backup"),
+        default: true,
+      },
     ],
   });
 

package/routes/homepage.js

@@ -547,7 +547,7 @@ const no_views_logged_in = async (req, res) => {
  * @returns {Promise<boolean>}
  */
 const get_config_response = async (role_id, res, req) => {
-  const wrap = async (contents, homeCfg, title, description) => {
+  const wrap = async (contents, homeCfg, title, description, no_menu) => {
     if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
     else
       res.sendWrap(
@@ -555,6 +555,7 @@ const get_config_response = async (role_id, res, req) => {
           title: title || "",
           description: description || "",
           bodyClass: "page_" + db.sqlsanitize(homeCfg),
+          no_menu,
         },
         contents
       );
@@ -574,7 +575,8 @@ const get_config_response = async (role_id, res, req) => {
         await db_page.run(req.query, { res, req }),
         homeCfg,
         db_page.title,
-        db_page.description
+        db_page.description,
+        db_page.attributes?.no_menu
       );
     else {
       const group = PageGroup.findOne({ name: homeCfg });
@@ -587,7 +589,8 @@ const get_config_response = async (role_id, res, req) => {
               await eligible.run(req.query, { res, req }),
               homeCfg,
               eligible.title,
-              eligible.description
+              eligible.description,
+              eligible.attributes?.no_menu
             );
         } else wrap(req.__("%s has no eligible page", group.name), homeCfg);
       } else res.redirect(homeCfg);

package/routes/plugins.js

@@ -1243,7 +1243,12 @@ router.post(
       res.redirect(`/plugins`);
       return;
     }
-    await load_plugins.loadAndSaveNewPlugin(plugin, forceReInstall);
+    const msgs = await load_plugins.loadAndSaveNewPlugin(
+      plugin,
+      forceReInstall,
+      undefined,
+      req.__
+    );
     const plugin_module = getState().plugins[name];
     await sleep(1000); // Allow other workers to load this plugin
     await getState().refresh_views();
@@ -1257,9 +1262,11 @@ router.post(
           plugin_db.name
         )
       );
+      if (msgs?.length > 0) req.flash("warning", msgs.join("<br>"));
       res.redirect(`/plugins/configure/${plugin_db.name}`);
     } else {
       req.flash("success", req.__(`Module %s installed`, plugin.name));
+      if (msgs?.length > 0) req.flash("warning", msgs.join("<br>"));
       res.redirect(`/plugins`);
     }
   })