@saltcorn/server 0.7.3-beta.3 → 0.7.3

package/routes/files.js

@@ -184,11 +184,11 @@ router.get(
  * @function
  */
 router.get(
-  "/resize/:id/:width_str",
+  "/resize/:id/:width_str/:height_str?",
   error_catcher(async (req, res) => {
     const role = req.user && req.user.id ? req.user.role_id : 10;
     const user_id = req.user && req.user.id;
-    const { id, width_str } = req.params;
+    const { id, width_str, height_str } = req.params;
     let file;
     if (typeof strictParseInt(id) !== "undefined")
       file = await File.findOne({ id });
@@ -208,15 +208,17 @@ router.get(
       if (file.s3_store) s3storage.serveObject(file, res, false);
       else {
         const width = strictParseInt(width_str);
+        const height = height_str ? strictParseInt(height_str) : null;
         if (!width) {
           res.sendFile(file.location);
           return;
         }
-        const fnm = `${file.location}_w${width}`;
+        const fnm = `${file.location}_w${width}${height ? `_h${height}` : ""}`;
         if (!fs.existsSync(fnm)) {
           await resizer({
             fromFileName: file.location,
             width,
+            height,
             toFileName: fnm,
           });
         }
@@ -376,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;
 };
 
@@ -429,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/homepage.js

@@ -49,7 +49,7 @@ const tableTable = (tables, req) =>
  */
 const tableCard = (tables, req) => ({
   type: "card",
-  class: "welcome-page-entity-list",
+  class: "welcome-page-entity-list mt-1",
   title: link("/table", req.__("Tables")),
   contents:
     (tables.length <= 1
@@ -102,7 +102,7 @@ const viewTable = (views, req) =>
 const viewCard = (views, req) => ({
   type: "card",
   title: link("/viewedit", req.__("Views")),
-  class: "welcome-page-entity-list",
+  class: "welcome-page-entity-list mt-1",
   bodyClass: "py-0  pe-0",
   contents:
     (views.length <= 1
@@ -156,7 +156,7 @@ const pageTable = (pages, req) =>
 const pageCard = (pages, req) => ({
   type: "card",
   title: link("/pageedit", req.__("Pages")),
-  class: "welcome-page-entity-list",
+  class: "welcome-page-entity-list mt-1",
   contents:
     (pages.length <= 1
       ? p(
@@ -369,9 +369,9 @@ const welcome_page = async (req) => {
     above: [
       {
         besides: [
-          pageCard(pages, req),
-          viewCard(views, req),
           tableCard(tables, req),
+          viewCard(views, req),
+          pageCard(pages, req),
         ],
       },
       {
@@ -380,7 +380,7 @@ const welcome_page = async (req) => {
             type: "card",
             //title: req.__("Install pack"),
             bodyClass: "py-0 pe-0",
-            class: "welcome-page-entity-list",
+            class: "welcome-page-entity-list mt-2",
 
             tabContents:
               triggers.length > 0
@@ -399,7 +399,7 @@ const welcome_page = async (req) => {
             type: "card",
             //title: req.__("Learn"),
             bodyClass: "py-0 pe-0",
-            class: "welcome-page-entity-list",
+            class: "welcome-page-entity-list mt-2",
             tabContents:
               users.length > 4
                 ? {

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

@@ -326,6 +326,7 @@ router.get(
         {
           type: "card",
           title: req.__("Your pages"),
+          class: "mt-0",
           contents: getPageList(pages, roles, req),
         },
         {

package/routes/plugins.js

@@ -506,6 +506,7 @@ const plugin_store_html = (items, req) => {
       },
       {
         type: "card",
+        class: "mt-0",
         contents: div(
           { class: "d-flex justify-content-between" },
           storeNavPills(req),
@@ -560,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()),
+    });
   })
 );
 
@@ -587,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);
@@ -605,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
         ? [
@@ -448,6 +448,7 @@ router.get(
           },
           {
             type: "card",
+            class: "mt-0",
             title: cardHeaderTabs([
               { label: req.__("Your tables"), href: "/table" },
               {
@@ -636,7 +637,9 @@ router.get(
     }
     var viewCard;
     if (fields.length > 0) {
-      const views = await View.find({ table_id: table.id });
+      const views = await View.find(
+        table.external ? { exttable_name: table.name } : { table_id: table.id }
+      );
       var viewCardContents;
       if (views.length > 0) {
         viewCardContents = mkTable(
@@ -801,15 +804,12 @@ router.get(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Tables"), href: "/table" },
-            { text: table.name },
+            { text: span({ class: "fw-bold text-body" }, table.name) },
           ],
         },
-        {
-          type: "pageHeader",
-          title: req.__(`%s table`, table.name),
-        },
         {
           type: "card",
+          class: "mt-0",
           title: req.__("Fields"),
           contents: fieldCard,
         },
@@ -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" });
     }
   })
 );
@@ -1076,6 +1077,7 @@ router.get(
         },
         {
           type: "card",
+          class: "mt-0",
           title: cardHeaderTabs([
             { label: req.__("Your tables"), href: "/table", active: true },
             {

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

@@ -197,6 +197,7 @@ router.get(
         },
         {
           type: "card",
+          class: "mt-0",
           title: req.__("Your views"),
           contents: [
             viewMarkup,
@@ -378,7 +379,13 @@ router.get(
         },
         {
           type: "card",
-          title: req.__(`Edit %s view`, viewname),
+          class: "mt-0",
+          title: req.__(
+            `%s view - %s on %s`,
+            viewname,
+            viewrow.viewtemplate,
+            viewrow.table_name
+          ),
           contents: renderForm(form, req.csrfToken()),
         },
       ],
@@ -415,6 +422,7 @@ router.get(
         },
         {
           type: "card",
+          class: "mt-0",
           title: req.__(`Create view`),
           contents: renderForm(form, req.csrfToken()),
         },
@@ -452,6 +460,7 @@ router.post(
           },
           {
             type: "card",
+            class: "mt-0",
             title: req.__(`Edit view`),
             contents: renderForm(form, req.csrfToken()),
           },
@@ -527,6 +536,7 @@ const respondWorkflow = (view, wf, wfres, req, res) => {
       },
       {
         type: noCard ? "container" : "card",
+        class: !noCard && "mt-0",
         title: wfres.title,
         contents,
       },
@@ -574,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)}`);
@@ -591,6 +601,7 @@ router.get(
         table_id: view.table_id,
         exttable_name: view.exttable_name,
         viewname: name,
+        ...(step ? { stepName: step } : {}),
       },
       req
     );

package/tests/tenant.test.js

@@ -10,6 +10,7 @@ const {
   toInclude,
   toNotInclude,
 } = require("../auth/testhelp");
+const { getState } = require("@saltcorn/data/db/state");
 
 afterAll(db.close);
 
@@ -24,6 +25,8 @@ describe("tenant routes", () => {
   if (!db.isSQLite) {
     it("shows create form", async () => {
       db.enable_multi_tenant();
+      await getState().setConfig("role_to_create_tenant", "10");
+
       const app = await getApp({ disableCsrf: true });
       await request(app).get("/tenant/create").expect(toInclude("subdomain"));
     });
@@ -37,6 +40,8 @@ describe("tenant routes", () => {
     });
     it("creates tenant with capital letter", async () => {
       db.enable_multi_tenant();
+      await getState().setConfig("role_to_create_tenant", "10");
+
       const app = await getApp({ disableCsrf: true });
       await request(app)
         .post("/tenant/create")
@@ -46,6 +51,7 @@ describe("tenant routes", () => {
     });
     it("rejects existing tenant", async () => {
       db.enable_multi_tenant();
+      await getState().setConfig("role_to_create_tenant", "10");
       const app = await getApp({ disableCsrf: true });
       await request(app)
         .post("/tenant/create")