@saltcorn/server 0.7.3-beta.7 → 0.7.4-beta.1

package/routes/plugins.js

@@ -79,7 +79,7 @@ const pluginForm = (req, plugin) => {
         label: req.__("Name"),
         name: "name",
         input_type: "text",
-        sublabel: req.__("Plugin name"),
+        sublabel: req.__("Module name"),
       }),
       new Field({
         label: req.__("Source"),
@@ -88,11 +88,11 @@ const pluginForm = (req, plugin) => {
         required: true,
         attributes: { options: "npm,local,github,git" },
         sublabel: req.__(
-          "Source of plugin for install. Few options:" +
-            "npm - download from npm repository," +
-            "local - get from local file system," +
-            "github - download from github," +
-            "git - get from git"
+          "Source of module for install. Few options:" +
+          "npm - download from npm repository," +
+          "local - get from local file system," +
+          "github - download from github," +
+          "git - get from git"
         ),
       }),
       new Field({
@@ -101,19 +101,19 @@ const pluginForm = (req, plugin) => {
         input_type: "text",
         sublabel: req.__(
           "For npm - name of npm package, e.g. @saltcorn/html or saltcorn-gantt, check at npmjs.com, " +
-            "for local - absolute path to plugin folder in file system, e.g.C:\\gitsrc\\any-bootstrap-theme\\, " +
-            "for github - name of github project."
+          "for local - absolute path to module folder in file system, e.g. C:\\gitsrc\\any-bootstrap-theme\\, " +
+          "for github - name of github project."
         ),
       }),
       ...(schema === db.connectObj.default_schema
         ? [
-            new Field({
-              label: req.__("Version"),
-              name: "version",
-              input_type: "text",
-              sublabel: req.__("Version of plugin, latest is default value"),
-            }),
-          ]
+          new Field({
+            label: req.__("Version"),
+            name: "version",
+            input_type: "text",
+            sublabel: req.__("Version of module, latest is default value"),
+          }),
+        ]
         : []),
       new Field({
         label: req.__("Private SSH key"),
@@ -257,7 +257,7 @@ const store_item_html = (req) => (item) => ({
   title: item.name,
   contents: div(
     div(
-      item.plugin && badge(req.__("Plugin")),
+      item.plugin && badge(req.__("Module")),
       item.pack && badge(req.__("Pack")),
       item.has_theme && badge(req.__("Theme")),
       item.has_auth && badge(req.__("Authentication")),
@@ -269,72 +269,72 @@ const store_item_html = (req) => (item) => ({
     div(item.description || ""),
     item.documentation_link
       ? div(
-          a(
-            { href: item.documentation_link, target: "_blank" },
-            req.__("Documentation")
-          )
+        a(
+          { href: item.documentation_link, target: "_blank" },
+          req.__("Documentation")
         )
+      )
       : ""
   ),
   footer: div(
     div(
       !item.installed &&
-        item.plugin &&
-        post_btn(
-          `/plugins/install/${encodeURIComponent(item.name)}`,
-          req.__("Install"),
-          req.csrfToken(),
-          {
-            klass: "store-install",
-            small: true,
-            onClick: "press_store_button(this)",
-          }
-        ),
+      item.plugin &&
+      post_btn(
+        `/plugins/install/${encodeURIComponent(item.name)}`,
+        req.__("Install"),
+        req.csrfToken(),
+        {
+          klass: "store-install",
+          small: true,
+          onClick: "press_store_button(this)",
+        }
+      ),
       !item.installed &&
-        item.pack &&
-        post_btn(
-          `/packs/install-named/${encodeURIComponent(item.name)}`,
-          req.__("Install"),
-          req.csrfToken(),
-          {
-            klass: "store-install",
-            small: true,
-            onClick: "press_store_button(this)",
-          }
-        ),
+      item.pack &&
+      post_btn(
+        `/packs/install-named/${encodeURIComponent(item.name)}`,
+        req.__("Install"),
+        req.csrfToken(),
+        {
+          klass: "store-install",
+          small: true,
+          onClick: "press_store_button(this)",
+        }
+      ),
 
       item.installed && item.plugin && cfg_link(req, item),
       item.installed && item.plugin && info_link(req, item),
 
       item.installed &&
-        item.pack &&
-        post_btn(
-          `/packs/uninstall/${encodeURIComponent(item.name)}`,
-          req.__("Uninstall"),
-          req.csrfToken(),
-          {
-            klass: "store-install",
-            small: true,
-            btnClass: "btn-danger",
-            formClass: "d-inline",
-            onClick: "press_store_button(this)",
-          }
-        ),
+      item.pack &&
+      post_btn(
+        `/packs/uninstall/${encodeURIComponent(item.name)}`,
+        req.__("Uninstall"),
+        req.csrfToken(),
+        {
+          klass: "store-install",
+          small: true,
+          btnClass: "btn-danger",
+          formClass: "d-inline",
+          onClick: "press_store_button(this)",
+        }
+      ),
       item.installed &&
-        item.plugin &&
-        item.name !== "base" &&
-        post_btn(
-          `/plugins/delete/${encodeURIComponent(item.name)}`,
-          req.__("Remove"),
-          req.csrfToken(),
-          {
-            klass: "store-install",
-            small: true,
-            btnClass: "btn-danger",
-            formClass: "d-inline",
-            onClick: "press_store_button(this)",
-          }
-        )
+      item.plugin &&
+      item.name !== "base" &&
+      post_btn(
+        `/plugins/delete/${encodeURIComponent(item.name)}`,
+        req.__("Remove"),
+        req.csrfToken(),
+        {
+          klass: "store-install",
+          small: true,
+          btnClass: "btn-danger",
+          formClass: "d-inline",
+          onClick: "press_store_button(this)",
+        }
+      )
     )
   ),
 });
@@ -354,7 +354,7 @@ const storeNavPills = (req) => {
             "nav-link",
             (req.query.set === txt.toLowerCase() ||
               (txt === "All" && !req.query.set)) &&
-              "active",
+            "active",
           ],
         },
         req.__(txt)
@@ -363,7 +363,7 @@ const storeNavPills = (req) => {
   return ul(
     { class: "nav nav-pills plugin-section" },
     link("All"),
-    link("Plugins"),
+    link("Modules"),
     link("Packs"),
     link("Themes"),
     link("Installed")
@@ -407,7 +407,7 @@ const satisfy_q = (p, q) => {
  */
 const filter_items_set = (items, query) => {
   switch (query.set) {
-    case "plugins":
+    case "modules":
       return items.filter((item) => item.plugin && !item.has_theme);
     case "packs":
       return items.filter((item) => item.pack);
@@ -451,23 +451,23 @@ const store_actions_dropdown = (req) =>
         '<i class="fas fa-sync"></i>&nbsp;' + req.__("Refresh")
       ),
       db.getTenantSchema() === db.connectObj.default_schema &&
-        a(
-          {
-            class: "dropdown-item",
-            href: `/plugins/upgrade`,
-            onClick: `notifyAlert('Upgrading plugins...', true)`,
-          },
-          '<i class="far fa-arrow-alt-circle-up"></i>&nbsp;' +
-            req.__("Upgrade installed plugins")
-        ),
+      a(
+        {
+          class: "dropdown-item",
+          href: `/plugins/upgrade`,
+          onClick: `notifyAlert('Upgrading modules...', true)`,
+        },
+        '<i class="far fa-arrow-alt-circle-up"></i>&nbsp;' +
+        req.__("Upgrade installed modules")
+      ),
       db.getTenantSchema() === db.connectObj.default_schema &&
-        a(
-          {
-            class: "dropdown-item",
-            href: `/plugins/new`,
-          },
-          '<i class="fas fa-plus"></i>&nbsp;' + req.__("Add another plugin")
-        ),
+      a(
+        {
+          class: "dropdown-item",
+          href: `/plugins/new`,
+        },
+        '<i class="fas fa-plus"></i>&nbsp;' + req.__("Add another module")
+      ),
 
       a(
         {
@@ -501,7 +501,7 @@ const plugin_store_html = (items, req) => {
         type: "breadcrumbs",
         crumbs: [
           { text: req.__("Settings"), href: "/settings" },
-          { text: req.__("Plugin and pack store") },
+          { text: req.__("Module store") },
         ],
       },
       {
@@ -534,7 +534,7 @@ router.get(
   error_catcher(async (req, res) => {
     const items = await get_store_items();
     const relevant_items = filter_items(items, req.query);
-    res.sendWrap(req.__("Plugins"), plugin_store_html(relevant_items, req));
+    res.sendWrap(req.__("Module store"), plugin_store_html(relevant_items, req));
   })
 );
 
@@ -561,12 +561,29 @@ 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 +605,30 @@ 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 +640,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
@@ -628,13 +692,13 @@ router.get(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Settings"), href: "/settings" },
-            { text: req.__("Plugin and pack store"), href: "/plugins" },
+            { text: req.__("Module store"), href: "/plugins" },
             { text: req.__("New") },
           ],
         },
         {
           type: "card",
-          title: req.__(`Add plugin`),
+          title: req.__(`Add module`),
           contents: renderForm(pluginForm(req), req.csrfToken()),
         },
       ],
@@ -742,35 +806,35 @@ router.get(
             latest || "",
             can_update
               ? a(
-                  {
-                    href: `/plugins/upgrade-plugin/${plugin_db.name}`,
-                    class: "btn btn-primary btn-sm ms-2",
-                  },
-                  req.__("Upgrade")
-                )
+                {
+                  href: `/plugins/upgrade-plugin/${plugin_db.name}`,
+                  class: "btn btn-primary btn-sm ms-2",
+                },
+                req.__("Upgrade")
+              )
               : ""
           )
         ),
         mod.plugin_module.dependencies
           ? tr(
-              th(req.__("Plugin dependencies")),
-              td(
-                mod.plugin_module.dependencies.map((d) =>
-                  span({ class: "badge bg-primary me-1" }, d)
-                )
+            th(req.__("Plugin dependencies")),
+            td(
+              mod.plugin_module.dependencies.map((d) =>
+                span({ class: "badge bg-primary me-1" }, d)
               )
             )
+          )
           : null,
         store_item && store_item.documentation_link
           ? tr(
-              th(req.__("Documentation")),
-              td(
-                link(
-                  store_item.documentation_link,
-                  store_item.documentation_link
-                )
+            th(req.__("Documentation")),
+            td(
+              link(
+                store_item.documentation_link,
+                store_item.documentation_link
               )
             )
+          )
           : null,
         pkgjson && pkgjson.repository
           ? tr(th(req.__("Repository")), td(showRepository(pkgjson.repository)))
@@ -795,13 +859,13 @@ router.get(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Settings"), href: "/settings" },
-            { text: req.__("Plugin and pack store"), href: "/plugins" },
+            { text: req.__("Module store"), href: "/plugins" },
             { text: plugin_db.name },
           ],
         },
         {
           type: "card",
-          title: req.__(`%s plugin information`, plugin_db.name),
+          title: req.__(`%s module information`, plugin_db.name),
           contents: p(store_item.description) + infoTable,
         },
         ...cards,
@@ -847,7 +911,7 @@ router.get(
     for (const plugin of installed_plugins) {
       await plugin.upgrade_version((p, f) => load_plugins.loadPlugin(p, f));
     }
-    req.flash("success", req.__(`Plugins up-to-date`));
+    req.flash("success", req.__(`Modules up-to-date`));
     await restart_tenant(loadAllPlugins);
     process.send &&
       process.send({ restart_tenant: true, tenant: db.getTenantSchema() });

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/settings.js

@@ -63,9 +63,9 @@ router.get(
           href: "/admin",
         }),
         settingsCard({
-          title: req.__("Plugins"),
-          icon: "fas fa-plug",
-          blurb: req.__("Plugin and pack installation and control"),
+          title: req.__("Modules"),
+          icon: "fas fa-cubes",
+          blurb: req.__("Module installation and control"),
           href: "/plugins",
         }),
         settingsCard({