@saltcorn/server 0.9.5-beta.19 → 0.9.5-beta.20

package/package.json

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

package/routes/actions.js

@@ -307,6 +307,14 @@ const triggerForm = async (req, trigger) => {
         showIf: { when_trigger: ["API call"] },
         options: roleOptions,
       },
+      {
+        name: "_raw_output",
+        label: "Raw Output",
+        parent_field: "configuration",
+        sublabel: req.__("Do not wrap response in a success object"),
+        type: "Bool",
+        showIf: { when_trigger: ["API call"] },
+      },
     ],
   });
   // if (trigger) {
@@ -450,6 +458,11 @@ router.post(
         },
       });
     } else {
+      if (form.values.configuration)
+        form.values.configuration = {
+          ...trigger.configuration,
+          ...form.values.configuration,
+        };
       await Trigger.update(trigger.id, form.values); //{configuration: form.values});
       req.flash("success", req.__("Action information saved"));
       res.redirect(`/actions/`);
@@ -730,7 +743,9 @@ router.post(
           },
         });
     } else {
-      await Trigger.update(trigger.id, { configuration: form.values });
+      await Trigger.update(trigger.id, {
+        configuration: { ...trigger.configuration, ...form.values },
+      });
       if (req.xhr) {
         res.json({ success: "ok" });
         return;

package/routes/admin.js

@@ -284,9 +284,23 @@ router.get(
     backupForm.values.auto_backup_destination = getState().getConfig(
       "auto_backup_destination"
     );
+    backupForm.values.auto_backup_tenants = getState().getConfig(
+      "auto_backup_tenants"
+    );
     backupForm.values.auto_backup_directory = getState().getConfig(
       "auto_backup_directory"
     );
+    backupForm.values.auto_backup_username = getState().getConfig(
+      "auto_backup_username"
+    );
+    backupForm.values.auto_backup_server =
+      getState().getConfig("auto_backup_server");
+    backupForm.values.auto_backup_password = getState().getConfig(
+      "auto_backup_password"
+    );
+    backupForm.values.auto_backup_port =
+      getState().getConfig("auto_backup_port");
+
     backupForm.values.auto_backup_expire_days = getState().getConfig(
       "auto_backup_expire_days"
     );
@@ -691,8 +705,10 @@ const backupFilePrefixForm = (req) =>
  * @param {object} req
  * @returns {Form} form
  */
-const autoBackupForm = (req) =>
-  new Form({
+const autoBackupForm = (req) => {
+  const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+
+  return new Form({
     action: "/admin/set-auto-backup",
     onChange: `saveAndContinue(this);$('#btnBackupNow').prop('disabled', $('#inputauto_backup_frequency').val()==='Never');`,
     noSubmitButton: true,
@@ -718,7 +734,47 @@ const autoBackupForm = (req) =>
         name: "auto_backup_destination",
         required: true,
         showIf: { auto_backup_frequency: ["Daily", "Weekly"] },
-        attributes: { options: ["Saltcorn files", "Local directory"] },
+        attributes: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          options: ["Saltcorn files", "Local directory", "SFTP server"],
+        },
+      },
+      {
+        type: "String",
+        label: req.__("Server host"),
+        name: "auto_backup_server",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "SFTP server",
+        },
+      },
+      {
+        type: "String",
+        label: req.__("Username"),
+        name: "auto_backup_username",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "SFTP server",
+        },
+      },
+      {
+        type: "String",
+        label: req.__("Password"),
+        fieldview: "password",
+        name: "auto_backup_password",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "SFTP server",
+        },
+      },
+      {
+        type: "Integer",
+        label: req.__("Port"),
+        name: "auto_backup_port",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "SFTP server",
+        },
       },
       {
         type: "String",
@@ -730,6 +786,19 @@ const autoBackupForm = (req) =>
           //auto_backup_destination: "Local directory",
         },
       },
+      {
+        type: "String",
+        label: req.__("Retain local directory"),
+        name: "auto_backup_retain_local_directory",
+        sublabel: req.__(
+          "Retain a local backup copy in this directory (optional)"
+        ),
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "SFTP server",
+          //auto_backup_destination: "Local directory",
+        },
+      },
       {
         type: "Integer",
         label: req.__("Expiration in days"),
@@ -742,6 +811,19 @@ const autoBackupForm = (req) =>
           auto_backup_destination: "Local directory",
         },
       },
+      ...(isRoot
+        ? [
+            {
+              type: "Bool",
+              label: req.__("All tenants"),
+              sublabel: req.__("Also backup all tenants"),
+              name: "auto_backup_tenants",
+              showIf: {
+                auto_backup_frequency: ["Daily", "Weekly"],
+              },
+            },
+          ]
+        : []),
       {
         type: "Bool",
         label: req.__("Include Event Logs"),
@@ -753,6 +835,7 @@ const autoBackupForm = (req) =>
       },
     ],
   });
+};
 
 /**
  * Snapshot Form

package/routes/api.js

@@ -373,7 +373,10 @@ router.all(
               res.redirect(resp.goto);
             else if (req.headers?.scgotourl)
               res.redirect(req.headers?.scgotourl);
-            else res.json({ success: true, data: resp });
+            else {
+              if (trigger.configuration?._raw_output) res.json({ resp });
+              else res.json({ success: true, data: resp });
+            }
           } catch (e) {
             Crash.create(e, req);
             res.status(400).json({ success: false, error: e.message });

package/routes/plugins.js

@@ -547,6 +547,16 @@ const plugin_store_html = (items, req) => {
   };
 };
 
+const flash_relogin = (req, exposedConfigs) => {
+  req.flash(
+    "warning",
+    req.__(
+      "To see changes for '%s' in show-if-formulas, users need to relogin",
+      exposedConfigs.join(", ")
+    )
+  );
+};
+
 /**
  * @name get
  * @function
@@ -789,6 +799,8 @@ router.post(
       const instore = await Plugin.store_plugins_available();
       const store_plugin = instore.find((p) => p.name === plugin.name);
       if (store_plugin && store_plugin.has_auth) flash_restart(req);
+      if (module.exposed_configs?.length > 0)
+        flash_relogin(req, module.exposed_configs);
       getState().processSend({
         refresh_plugin_cfg: plugin.name,
         tenant: db.getTenantSchema(),
@@ -936,6 +948,14 @@ router.post(
       ...(plugin.configuration ? plugin.configuration : {}),
       ...values,
     });
+    const sessionUser = req.session?.passport?.user;
+    if (sessionUser) {
+      const pluginName = module.plugin_name;
+      if (sessionUser.attributes) {
+        const oldAttrs = sessionUser.attributes[pluginName] || {};
+        sessionUser.attributes[pluginName] = { ...oldAttrs, ...values };
+      } else sessionUser.attributes = { [pluginName]: values };
+    }
     getState().processSend({
       refresh_plugin_cfg: plugin.name,
       tenant: db.getTenantSchema(),
@@ -976,6 +996,14 @@ router.post(
     getState().userLayouts[req.user.email] = module.layout(
       userAttrs.layout.config
     );
+    const sessionUser = req.session?.passport?.user;
+    if (sessionUser) {
+      const pluginName = module.plugin_name;
+      if (sessionUser.attributes) {
+        const oldAttrs = sessionUser.attributes[pluginName] || {};
+        sessionUser.attributes[pluginName] = { ...oldAttrs, ...values };
+      } else sessionUser.attributes = { [pluginName]: values };
+    }
     getState().processSend({
       refresh_plugin_cfg: plugin.name,
       tenant: db.getTenantSchema(),
@@ -997,6 +1025,14 @@ router.post(
       delete userAttrs.layout;
       await user.update({ _attributes: userAttrs });
       getState().userLayouts[req.user.email] = null;
+      let module = getState().plugins[plugin];
+      if (!module) {
+        module = getState().plugins[getState().plugin_module_names[plugin]];
+      }
+      const pluginName = module.plugin_name;
+      const sessionUser = req.session?.passport?.user;
+      if (sessionUser?.attributes[pluginName])
+        sessionUser.attributes[pluginName] = {};
       getState().processSend({
         refresh_plugin_cfg: plugin,
         tenant: db.getTenantSchema(),

package/routes/search.js

@@ -52,6 +52,12 @@ const searchConfigForm = (tables, views, req) => {
         attributes: { options: ok_views.map((v) => v.name).join() },
       });
   }
+  fields.push({
+    name: "search_table_description",
+    label: req.__("Description header"),
+    sublabel: req.__("Use table description instead of name as header"),
+    type: "Bool",
+  });
   const blurb1 = req.__(
     `Choose views for <a href="/search">search results</a> for each table.<br/>Set to blank to omit table from global search.`
   );
@@ -84,7 +90,11 @@ router.get(
     const views = await View.find({}, { orderBy: "name" });
     const tables = await Table.find();
     const form = searchConfigForm(tables, views, req);
-    form.values = getState().getConfig("globalSearch");
+    form.values = getState().getConfig("globalSearch", {});
+    form.values.search_table_description = getState().getConfig(
+      "search_table_description",
+      false
+    );
     send_infoarch_page({
       res,
       req,
@@ -116,6 +126,13 @@ router.post(
     const result = form.validate(req.body);
 
     if (result.success) {
+      const search_table_description =
+        !!result.success.search_table_description;
+      await getState().setConfig(
+        "search_table_description",
+        search_table_description
+      );
+      delete result.success.search_table_description;
       await getState().setConfig("globalSearch", result.success);
       if (!req.xhr) res.redirect("/search/config");
       else res.json({ success: "ok" });
@@ -175,6 +192,10 @@ const runSearch = async ({ q, _page, table }, req, res) => {
     res.redirect("/");
     return;
   }
+  const search_table_description = getState().getConfig(
+    "search_table_description",
+    false
+  );
   const current_page = parseInt(_page) || 1;
   const offset = (current_page - 1) * page_size;
   let resp = [];
@@ -184,6 +205,11 @@ const runSearch = async ({ q, _page, table }, req, res) => {
     if (!viewName || viewName === "") continue;
     tablesConfigured += 1;
     if (table && tableName !== table) continue;
+    let sectionHeader = tableName;
+    if (search_table_description) {
+      sectionHeader =
+        Table.findOne({ name: tableName })?.description || tableName;
+    }
     const view = await View.findOne({ name: viewName });
     if (!view)
       throw new InvalidConfiguration(
@@ -209,7 +235,7 @@ const runSearch = async ({ q, _page, table }, req, res) => {
       tablesWithResults.push(tableName);
       resp.push({
         type: "card",
-        title: span({ id: tableName }, tableName),
+        title: span({ id: tableName }, sectionHeader),
         contents: vresps.map((vr) => vr.html).join("<hr>") + paginate,
       });
     }