@saltcorn/server 0.7.3-beta.7 → 0.7.3

package/auth/admin.js

@@ -381,7 +381,8 @@ router.post(
     } else {
       await save_config_from_form(form);
       req.flash("success", req.__("User settings updated"));
-      res.redirect("/useradmin/settings");
+      if (!req.xhr) res.redirect("/useradmin/settings");
+      else res.json({ success: "ok" });
     }
   })
 );
@@ -530,7 +531,7 @@ router.get(
     send_users_page({
       res,
       req,
-      active_sub: "Settings",
+      active_sub: "SSL",
       contents: {
         type: "card",
         title: req.__("Authentication settings"),
@@ -556,7 +557,7 @@ router.post(
       send_users_page({
         res,
         req,
-        active_sub: "Settings",
+        active_sub: "SSL",
         contents: {
           type: "card",
           title: req.__("Authentication settings"),
@@ -572,7 +573,9 @@ router.post(
           " " +
           a({ href: "/admin/system" }, req.__("Restart here"))
       );
-      res.redirect("/useradmin/ssl");
+      if (!req.xhr) {
+        res.redirect("/useradmin/ssl");
+      } else res.json({ success: "ok" });
     }
   })
 );

package/locales/en.json

@@ -920,5 +920,6 @@
 	"Download automated backup": "Download automated backup",
 	"Restoring automated backup": "Restoring automated backup",
 	"No errors detected during configuration check": "No errors detected during configuration check",
-	"%s view - %s on %s": "%s view - %s on %s"
+	"%s view - %s on %s": "%s view - %s on %s",
+	"Back": "Back"
 }

package/markup/admin.js

@@ -345,7 +345,7 @@ const flash_restart = (req) => {
  * @param {*} opts.formArgs
  * @returns {Promise<Form>}
  */
-const config_fields_form = async ({ field_names, req, ...formArgs }) => {
+const config_fields_form = async ({ field_names, req, action, ...formArgs }) => {
   const values = {};
   const state = getState();
   const fields = [];
@@ -396,8 +396,9 @@ const config_fields_form = async ({ field_names, req, ...formArgs }) => {
   const form = new Form({
     fields,
     values,
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    action,
+    noSubmitButton: true,
+    onChange: `saveAndContinue(this)`,
     ...formArgs,
   });
   await form.fill_fkey_options();

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.3-beta.7",
+  "version": "0.7.3",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.7.3-beta.7",
-    "@saltcorn/builder": "0.7.3-beta.7",
-    "@saltcorn/data": "0.7.3-beta.7",
-    "@saltcorn/admin-models": "0.7.3-beta.7",
-    "@saltcorn/markup": "0.7.3-beta.7",
-    "@saltcorn/sbadmin2": "0.7.3-beta.7",
+    "@saltcorn/base-plugin": "0.7.3",
+    "@saltcorn/builder": "0.7.3",
+    "@saltcorn/data": "0.7.3",
+    "@saltcorn/admin-models": "0.7.3",
+    "@saltcorn/markup": "0.7.3",
+    "@saltcorn/sbadmin2": "0.7.3",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",

package/public/saltcorn-common.js

@@ -502,7 +502,7 @@ function common_done(res, isWeb = true) {
   }
 }
 
-const repeaterCopyValuesToForm = (form, editor) => {
+const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
   const vs = JSON.parse(editor.getString());
 
   const setVal = (k, ix, v) => {
@@ -533,6 +533,7 @@ const repeaterCopyValuesToForm = (form, editor) => {
     if (typeof ix !== "number" || isNaN(ix)) return;
     if (ix >= vs.length) $(this).remove();
   });
+  !noTriggerChange && form.trigger("change");
 };
 function align_dropdown(id) {
   setTimeout(() => {

package/public/saltcorn.js

@@ -213,6 +213,7 @@ function ajax_modal(url, opts = {}) {
       (opts.onOpen || function () {})(res);
       $("#scmodal").on("hidden.bs.modal", function (e) {
         (opts.onClose || function () {})(res);
+        $("body").css("overflow", "");
       });
     },
   });
@@ -248,7 +249,7 @@ function saveAndContinue(e, k) {
   return false;
 }
 
-function applyViewConfig(e, url) {
+function applyViewConfig(e, url, k) {
   var form = $(e).closest("form");
   var form_data = form.serializeArray();
   const cfg = {};
@@ -264,6 +265,9 @@ function applyViewConfig(e, url) {
     },
     data: JSON.stringify(cfg),
     error: function (request) {},
+    success: function (res) {
+      k && k(res);
+    },
   });
 
   return false;

package/routes/admin.js

@@ -46,6 +46,8 @@ const {
   ul,
   li,
   ol,
+  script,
+  domReady,
 } = require("@saltcorn/markup/tags");
 const db = require("@saltcorn/data/db");
 const {
@@ -141,10 +143,6 @@ const email_form = async (req) => {
     ],
     action: "/admin/email",
   });
-  form.submitButtonClass = "btn-outline-primary";
-  form.submitLabel = req.__("Save");
-  form.onChange =
-    "remove_outline(this);$('#testemail').attr('href','#').removeClass('btn-primary').addClass('btn-outline-primary')";
   return form;
 };
 
@@ -215,8 +213,10 @@ router.post(
       flash_restart_if_required(form, req);
       await save_config_from_form(form);
 
-      req.flash("success", req.__("Site identity settings updated"));
-      res.redirect("/admin");
+      if (!req.xhr) {
+        req.flash("success", req.__("Site identity settings updated"));
+        res.redirect("/admin");
+      } else res.json({ success: "ok" });
     }
   })
 );
@@ -309,7 +309,8 @@ router.post(
     } else {
       await save_config_from_form(form);
       req.flash("success", req.__("Email settings updated"));
-      res.redirect("/admin/email");
+      if (!req.xhr) res.redirect("/admin/email");
+      else res.json({ success: "ok" });
     }
   })
 );
@@ -379,6 +380,11 @@ router.get(
                   a(
                     { href: "/admin/auto-backup-list" },
                     "Restore/download automated backups »"
+                  ),
+                  script(
+                    domReady(
+                      `$('#btnBackupNow').prop('disabled', $('#inputauto_backup_frequency').val()==='Never');`
+                    )
                   )
                 ),
               }
@@ -484,9 +490,8 @@ router.get(
 const autoBackupForm = (req) =>
   new Form({
     action: "/admin/set-auto-backup",
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
-    submitLabel: "Save settings",
+    onChange: `saveAndContinue(this);$('#btnBackupNow').prop('disabled', $('#inputauto_backup_frequency').val()==='Never');`,
+    noSubmitButton: true,
     additionalButtons: [
       {
         label: "Backup now",
@@ -555,7 +560,8 @@ router.post(
     } else {
       await save_config_from_form(form);
       req.flash("success", req.__("Backup settings updated"));
-      res.redirect("/admin/backup");
+      if (!req.xhr) res.redirect("/admin/backup");
+      else res.json({ success: "ok" });
     }
   })
 );

package/routes/eventlog.js

@@ -73,8 +73,9 @@ const logSettingsForm = async (req) => {
       fields.push({
         name: w + "_channel",
         label: w + " channel",
-        sublabel:
-          req.__("Channels to create events for. Separate by comma; leave blank for all"),
+        sublabel: req.__(
+          "Channels to create events for. Separate by comma; leave blank for all"
+        ),
         type: "String",
         showIf: { [w]: true },
       });
@@ -82,8 +83,8 @@ const logSettingsForm = async (req) => {
   return new Form({
     action: "/eventlog/settings",
     blurb: req.__("Which events should be logged?"),
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    noSubmitButton: true,
+    onChange: "saveAndContinue(this)",
     fields,
   });
 };
@@ -169,23 +170,23 @@ router.get(
  * @returns {Form}
  */
 const customEventForm = async (req) => {
-    return new Form({
-        action: "/eventlog/custom/new",
-        submitButtonClass: "btn-outline-primary",
-        onChange: "remove_outline(this)",
-        fields: [
-            {
-                name: "name",
-                label: req.__("Event Name"),
-                type: "String",
-            },
-            {
-                name: "hasChannel",
-                label: req.__("Has channels?"),
-                type: "Bool",
-            },
-        ],
-    });
+  return new Form({
+    action: "/eventlog/custom/new",
+    submitButtonClass: "btn-outline-primary",
+    onChange: "remove_outline(this)",
+    fields: [
+      {
+        name: "name",
+        label: req.__("Event Name"),
+        type: "String",
+      },
+      {
+        name: "hasChannel",
+        label: req.__("Has channels?"),
+        type: "Bool",
+      },
+    ],
+  });
 };
 /**
  * @name get/custom/new
@@ -297,7 +298,8 @@ router.post(
     } else {
       await getState().setConfig("event_log_settings", form.values);
 
-      res.redirect(`/eventlog/settings`);
+      if (!req.xhr) res.redirect(`/eventlog/settings`);
+      else res.json({ success: "ok" });
     }
   })
 );

package/routes/files.js

@@ -378,9 +378,6 @@ const storage_form = async (req) => {
     ],
     action: "/files/storage",
   });
-  form.submitButtonClass = "btn-outline-primary";
-  form.submitLabel = req.__("Save");
-  form.onChange = "remove_outline(this)";
   return form;
 };
 
@@ -431,8 +428,11 @@ router.post(
       });
     } else {
       await save_config_from_form(form);
-      req.flash("success", req.__("Storage settings updated"));
-      res.redirect("/files/storage");
+
+      if (!req.xhr) {
+        req.flash("success", req.__("Storage settings updated"));
+        res.redirect("/files/storage");
+      } else res.json({ success: "ok" });
     }
   })
 );

package/routes/infoarch.js

@@ -48,8 +48,8 @@ router.get(
 const languageForm = (req) =>
   new Form({
     action: "/site-structure/localizer/save-lang",
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    onChange: "saveAndContinue(this)",
+    noSubmitButton: true,
     fields: [
       {
         name: "name",
@@ -270,7 +270,10 @@ router.post(
         ...cfgLangs,
         [lang.locale]: lang,
       });
-      res.redirect(`/site-structure/localizer/edit/${lang.locale}`);
+
+      if (!req.xhr)
+        res.redirect(`/site-structure/localizer/edit/${lang.locale}`);
+      else res.json({ success: "ok" });
     }
   })
 );

package/routes/plugins.js

@@ -561,12 +561,30 @@ router.get(
     }
     const flow = module.configuration_workflow();
     flow.action = `/plugins/configure/${encodeURIComponent(plugin.name)}`;
+    flow.autoSave = true;
+    flow.saveURL = `/plugins/saveconfig/${encodeURIComponent(plugin.name)}`;
     const wfres = await flow.run(plugin.configuration || {});
+    if (module.layout) {
+      wfres.renderForm.additionalButtons = [
+        ...(wfres.renderForm.additionalButtons || []),
+        {
+          label: "Reload page to see changes",
+          id: "btnReloadNow",
+          class: "btn btn-outline-secondary",
+          onclick: "location.reload()",
+        },
+      ];
+      wfres.renderForm.onChange = `${
+        wfres.renderForm.onChange || ""
+      };$('#btnReloadNow').removeClass('btn-outline-secondary').addClass('btn-secondary')`;
+    }
 
-    res.sendWrap(
-      req.__(`Configure %s Plugin`, plugin.name),
-      renderForm(wfres.renderForm, req.csrfToken())
-    );
+    res.sendWrap(req.__(`Configure %s Plugin`, plugin.name), {
+      type: "card",
+      class: "mt-0",
+      title: req.__(`Configure %s Plugin`, plugin.name),
+      contents: renderForm(wfres.renderForm, req.csrfToken()),
+    });
   })
 );
 
@@ -588,13 +606,31 @@ router.post(
     }
     const flow = module.configuration_workflow();
     flow.action = `/plugins/configure/${encodeURIComponent(plugin.name)}`;
+    flow.autoSave = true;
+    flow.saveURL = `/plugins/saveconfig/${encodeURIComponent(plugin.name)}`;
     const wfres = await flow.run(req.body);
-    if (wfres.renderForm)
-      res.sendWrap(
-        req.__(`Configure %s Plugin`, plugin.name),
-        renderForm(wfres.renderForm, req.csrfToken())
-      );
-    else {
+    if (wfres.renderForm) {
+      if (module.layout) {
+        wfres.renderForm.additionalButtons = [
+          ...(wfres.renderForm.additionalButtons || []),
+          {
+            label: "Reload page to see changes",
+            id: "btnReloadNow",
+            class: "btn btn-outline-secondary",
+            onclick: "location.reload()",
+          },
+        ];
+        wfres.renderForm.onChange = `${
+          wfres.renderForm.onChange || ""
+        };$('#btnReloadNow').removeClass('btn-outline-secondary').addClass('btn-secondary')`;
+      }
+      res.sendWrap(req.__(`Configure %s Plugin`, plugin.name), {
+        type: "card",
+        class: "mt-0",
+        title: req.__(`Configure %s Plugin`, plugin.name),
+        contents: renderForm(wfres.renderForm, req.csrfToken()),
+      });
+    } else {
       plugin.configuration = wfres;
       await plugin.upsert();
       await load_plugins.loadPlugin(plugin);
@@ -606,12 +642,42 @@ router.post(
           refresh_plugin_cfg: plugin.name,
           tenant: db.getTenantSchema(),
         });
-      await sleep(500); // Allow other workers to reload this plugin
+      if (module.layout) await sleep(500); // Allow other workers to reload this plugin
       res.redirect("/plugins");
     }
   })
 );
 
+router.post(
+  "/saveconfig/:name",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { name } = req.params;
+    const plugin = await Plugin.findOne({ name: decodeURIComponent(name) });
+    let module = getState().plugins[plugin.name];
+    if (!module) {
+      module = getState().plugins[getState().plugin_module_names[plugin.name]];
+    }
+    const flow = module.configuration_workflow();
+    const step = await flow.singleStepForm(req.body, req);
+    if (step?.renderForm) {
+      if (!step.renderForm.hasErrors) {
+        plugin.configuration = {
+          ...plugin.configuration,
+          ...step.renderForm.values,
+        };
+        await plugin.upsert();
+        await load_plugins.loadPlugin(plugin);
+        process.send &&
+          process.send({
+            refresh_plugin_cfg: plugin.name,
+            tenant: db.getTenantSchema(),
+          });
+        res.json({ success: "ok" });
+      }
+    }
+  })
+);
 /**
  * @name get/new
  * @function

package/routes/search.js

@@ -55,7 +55,8 @@ const searchConfigForm = (tables, views, req) => {
   );
   return new Form({
     action: "/search/config",
-    submitLabel: req.__("Save"),
+    noSubmitButton: true,
+    onChange: `saveAndContinue(this)`,
     blurb:
       blurb1 +
       (tbls_noviews.length > 0
@@ -111,7 +112,8 @@ router.post(
 
     if (result.success) {
       await getState().setConfig("globalSearch", result.success);
-      res.redirect("/search/config");
+      if (!req.xhr) res.redirect("/search/config");
+      else res.json({ success: "ok" });
     } else {
       send_infoarch_page({
         res,

package/routes/tables.js

@@ -83,8 +83,8 @@ const tableForm = async (table, req) => {
     .map((f) => ({ value: f.id, label: f.name }));
   const form = new Form({
     action: "/table",
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    noSubmitButton: true,
+    onChange: "saveAndContinue(this)",
     fields: [
       ...(!table.external
         ? [
@@ -910,7 +910,8 @@ router.post(
         );
       else if (!hasError) req.flash("success", req.__("Table saved"));
 
-      res.redirect(`/table/${id}`);
+      if (!req.xhr) res.redirect(`/table/${id}`);
+      else res.json({ success: "ok" });
     }
   })
 );

package/routes/tenant.js

@@ -452,8 +452,10 @@ router.post(
     } else {
       await save_config_from_form(form);
 
-      req.flash("success", req.__("Tenant settings updated"));
-      res.redirect("/tenant/settings");
+      if (!req.xhr) {
+        req.flash("success", req.__("Tenant settings updated"));
+        res.redirect("/tenant/settings");
+      } else res.json({ success: "ok" });
     }
   })
 );

package/routes/viewedit.js

@@ -584,7 +584,7 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
-
+    const { step } = req.query;
     const view = await View.findOne({ name });
     if (!view) {
       req.flash("error", `View not found: ${text(name)}`);
@@ -601,6 +601,7 @@ router.get(
         table_id: view.table_id,
         exttable_name: view.exttable_name,
         viewname: name,
+        ...(step ? { stepName: step } : {}),
       },
       req
     );