@saltcorn/server 0.9.5-beta.22 → 0.9.5-beta.24

package/package.json

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

package/public/saltcorn.js

@@ -544,7 +544,7 @@ function updateViewPreview() {
   }
 }
 
-function ajaxSubmitForm(e) {
+function ajaxSubmitForm(e, force_no_reload) {
   var form = $(e).closest("form");
   var url = form.attr("action");
   $.ajax(url, {
@@ -561,11 +561,11 @@ function ajaxSubmitForm(e) {
         "data-on-close-reload-view"
       );
       $("#scmodal").modal("hide");
-      if (on_close_reload_view) {
+      if (!force_no_reload && on_close_reload_view) {
         const viewE = $(`[data-sc-embed-viewname="${on_close_reload_view}"]`);
         if (viewE.length) reload_embedded_view(on_close_reload_view);
         else location.reload();
-      } else if (!no_reload) location.reload();
+      } else if (!force_no_reload && !no_reload) location.reload();
       else common_done(res, form.attr("data-viewname"));
     },
     error: function (request) {

package/routes/admin.js

@@ -290,6 +290,9 @@ router.get(
     backupForm.values.auto_backup_directory = getState().getConfig(
       "auto_backup_directory"
     );
+    backupForm.values.auto_backup_retain_local_directory = getState().getConfig(
+      "auto_backup_retain_local_directory"
+    );
     backupForm.values.auto_backup_username = getState().getConfig(
       "auto_backup_username"
     );

package/routes/plugins.js

@@ -363,7 +363,9 @@ const storeNavPills = (req) => {
       { class: "nav-item" },
       a(
         {
-          href: `/plugins?set=${txt.toLowerCase()}`,
+          href: `/plugins?set=${txt.toLowerCase()}${
+            req.query.q ? `&q=${req.query.q}` : ""
+          }`,
           class: [
             "nav-link",
             (req.query.set === txt.toLowerCase() ||
@@ -1093,8 +1095,15 @@ router.get(
       const fullpath = path.join(location, "public", safeFile);
       if (fs.existsSync(fullpath))
         res.sendFile(fullpath, { maxAge: hasVersion ? "100d" : "1d" });
-      else res.status(404).send(req.__("Not found"));
+      else {
+        getState().log(6, `Plugin serve public: file not found ${fullpath}`);
+        res.status(404).send(req.__("Not found"));
+      }
     } else {
+      getState().log(
+        6,
+        `Plugin serve public: No location for plugin: ${plugin}`
+      );
       res.status(404).send(req.__("Not found"));
     }
   })

package/routes/tag_entries.js

@@ -87,9 +87,9 @@ const formOptions = async (type, tag_id) => {
     case "triggers": {
       const ids = await tag.getTriggerIds();
       return {
-        triggers: Trigger.find().filter(
-          (value) => ids.indexOf(value.id) === -1
-        ),
+        triggers: (
+          await Trigger.findDB({}, { orderBy: "name", nocase: true })
+        ).filter((value) => ids.indexOf(value.id) === -1),
       };
     }
   }