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

package/routes/pageedit.js

@@ -196,7 +196,7 @@ const pageBuilderData = async (req, context) => {
       f.required = false;
       if (f.type && f.type.name === "Bool") f.fieldview = "tristate";
 
-      await f.fill_fkey_options(true);
+      //await f.fill_fkey_options(true);
       fixed_state_fields[view.name].push(f);
       if (table.name === "users" && f.primary_key)
         fixed_state_fields[view.name].push(

package/routes/plugins.js

@@ -6,7 +6,7 @@
  */
 
 const Router = require("express-promise-router");
-const { isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, loggedIn, error_catcher } = require("./utils.js");
 const { renderForm, link, post_btn } = require("@saltcorn/markup");
 const {
   getState,
@@ -16,6 +16,7 @@ const {
 const Form = require("@saltcorn/data/models/form");
 const Field = require("@saltcorn/data/models/field");
 const Plugin = require("@saltcorn/data/models/plugin");
+const User = require("@saltcorn/data/models/user");
 const { fetch_available_packs } = require("@saltcorn/admin-models/models/pack");
 const {
   upgrade_all_tenants_plugins,
@@ -57,6 +58,7 @@ const { flash_restart } = require("../markup/admin.js");
 const { sleep, removeNonWordChars } = require("@saltcorn/data/utils");
 const { loadAllPlugins } = require("../load_plugins");
 const npmFetch = require("npm-registry-fetch");
+const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer");
 
 /**
  * @type {object}
@@ -545,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
@@ -696,7 +708,12 @@ router.get(
           label: "Reload page to see changes",
           id: "btnReloadNow",
           class: "btn btn-outline-secondary",
-          onclick: "location.reload()",
+          onclick: `if (window.savingViewConfig) 
+  notifyAlert({
+    type: 'danger',
+    text: 'Still saving, please wait',
+  });
+else location.reload();`,
         },
       ];
       wfres.renderForm.onChange = `${
@@ -704,25 +721,31 @@ router.get(
       };$('#btnReloadNow').removeClass('btn-outline-secondary').addClass('btn-secondary')`;
     }
 
-    res.sendWrap(req.__(`Configure %s Plugin`, plugin.name), {
-      above: [
-        {
-          type: "breadcrumbs",
-          crumbs: [
-            { text: req.__("Settings"), href: "/settings" },
-            { text: req.__("Module store"), href: "/plugins" },
-            { text: plugin.name },
-          ],
-        },
-        {
-          type: "card",
-          class: "mt-0",
-          title: req.__(`Configure %s Plugin`, plugin.name),
-          titleAjaxIndicator: true,
-          contents: renderForm(wfres.renderForm, req.csrfToken()),
-        },
-      ],
-    });
+    res.sendWrap(
+      {
+        title: req.__(`Configure %s Plugin`, plugin.name),
+        headers: wfres.renderForm?.additionalHeaders || [],
+      },
+      {
+        above: [
+          {
+            type: "breadcrumbs",
+            crumbs: [
+              { text: req.__("Settings"), href: "/settings" },
+              { text: req.__("Module store"), href: "/plugins" },
+              { text: plugin.name },
+            ],
+          },
+          {
+            type: "card",
+            class: "mt-0",
+            title: req.__(`Configure %s Plugin`, plugin.name),
+            titleAjaxIndicator: true,
+            contents: renderForm(wfres.renderForm, req.csrfToken()),
+          },
+        ],
+      }
+    );
   })
 );
 
@@ -769,17 +792,21 @@ router.post(
         contents: renderForm(wfres.renderForm, req.csrfToken()),
       });
     } else {
-      plugin.configuration = wfres;
+      const newCfg = wfres.cleanup ? wfres.context : wfres;
+      plugin.configuration = newCfg;
       await plugin.upsert();
       await load_plugins.loadPlugin(plugin);
       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(),
       });
       if (module.layout) await sleep(500); // Allow other workers to reload this plugin
+      if (wfres.cleanup) await wfres.cleanup();
       res.redirect("/plugins");
     }
   })
@@ -798,22 +825,223 @@ router.post(
     const flow = module.configuration_workflow();
     const step = await flow.singleStepForm(req.body, req);
     if (step?.renderForm) {
-      if (!step.renderForm.hasErrors) {
+      if (step.renderForm.hasErrors || step.savingErrors)
+        res.status(400).send(step.savingErrors || "Error");
+      else {
         plugin.configuration = {
           ...plugin.configuration,
           ...step.renderForm.values,
         };
         await plugin.upsert();
         await load_plugins.loadPlugin(plugin);
-        getState().processSend({
-          refresh_plugin_cfg: plugin.name,
-          tenant: db.getTenantSchema(),
-        });
-        res.json({ success: "ok" });
       }
+      getState().processSend({
+        refresh_plugin_cfg: plugin.name,
+        tenant: db.getTenantSchema(),
+      });
+      res.json({ success: "ok" });
     }
   })
 );
+
+router.get(
+  "/user_configure/:name",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const user = await User.findOne({ id: req.user?.id });
+    if (!user) {
+      req.flash("error", req.__("Not authorized"));
+      return res.redirect("/");
+    }
+    const { name } = req.params;
+    const plugin = await Plugin.findOne({ name: decodeURIComponent(name) });
+    if (!plugin) {
+      req.flash("warning", req.__("Module not found"));
+      return res.redirect("/auth/settings");
+    }
+    let module = getState().plugins[plugin.name];
+    if (!module) {
+      module = getState().plugins[getState().plugin_module_names[plugin.name]];
+    }
+    const form = await module.user_config_form({
+      ...(plugin.configuration || {}),
+      ...(user._attributes?.layout?.config || {}),
+    });
+    form.action = `/plugins/user_configure/${encodeURIComponent(plugin.name)}`;
+    form.onChange = `applyViewConfig(this, '/plugins/user_saveconfig/${encodeURIComponent(
+      name
+    )}', null, event);$('#btnReloadNow').removeClass('btn-outline-secondary').addClass('btn-secondary')`;
+
+    form.additionalButtons = [
+      {
+        label: "Reload page to see changes",
+        id: "btnReloadNow",
+        class: "btn btn-outline-secondary",
+        onclick: "location.reload();",
+      },
+    ];
+    form.submitLabel = req.__("Finish") + " »";
+    res.sendWrap(
+      {
+        title: req.__(`Configure %s Plugin for %s`, plugin.name, user.email),
+        headers: form.additionalHeaders || [],
+      },
+      {
+        above: [
+          {
+            type: "breadcrumbs",
+            crumbs: [
+              { text: req.__("Settings"), href: "/settings" },
+              { text: req.__("Module store"), href: "/plugins" },
+              { text: plugin.name },
+            ],
+          },
+          {
+            type: "card",
+            class: "mt-0",
+            title: req.__(`Configure %s Plugin`, plugin.name),
+            titleAjaxIndicator: true,
+            contents: renderForm(form, req.csrfToken()),
+          },
+        ],
+      }
+    );
+  })
+);
+
+router.post(
+  "/user_configure/:name",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const user = await User.findOne({ id: req.user?.id });
+    if (!user) {
+      req.flash("error", req.__("Not authorized"));
+      return res.redirect("/");
+    }
+    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 form = await module.user_config_form({
+      ...(plugin.configuration || {}),
+      ...(user._attributes?.layout?.config || {}),
+    });
+    const valResult = form.validate(req.body);
+    if (form.hasErrors) {
+      req.flash("warning", req.__("An error occurred"));
+      return res.sendWrap(
+        req.__(`Configure %s Plugin for %s`, plugin.name, user.email),
+        renderForm(form, req.csrfToken())
+      );
+    }
+    const values = valResult.success;
+    values.is_user_config = true;
+    const userAttrs = user._attributes ? { ...user._attributes } : {};
+    userAttrs.layout = {
+      plugin: plugin.name,
+      config: values,
+    };
+    await user.update({ _attributes: userAttrs });
+    getState().userLayouts[req.user.email] = module.layout({
+      ...(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(),
+    });
+    if (module.layout) await sleep(500); // Allow other workers to reload this plugin
+    res.redirect("/auth/settings");
+  })
+);
+
+router.post(
+  "/user_saveconfig/:name",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const user = await User.findOne({ id: req.user?.id });
+    if (!user) return res.status(401).json({ error: req.__("Not authorized") });
+    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 form = await module.user_config_form({
+      ...(plugin.configuration || {}),
+      ...(user._attributes?.layout?.config || {}),
+    });
+    const valResult = form.validate(req.body);
+    if (form.hasErrors) {
+      return res.status(400).json({ error: req.__("An error occured") });
+    }
+    const values = valResult.success;
+    values.is_user_config = true;
+    const userAttrs = user._attributes ? { ...user._attributes } : {};
+    userAttrs.layout = {
+      plugin: plugin.name,
+      config: values,
+    };
+    await user.update({ _attributes: userAttrs });
+    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(),
+    });
+    res.json({ success: "ok" });
+  })
+);
+
+router.post(
+  "/remove_user_layout",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const user = await User.findOne({ id: req.user.id });
+    if (!user) {
+      return res.status(401).json({ error: req.__("Not authorized") });
+    } else if (user._attributes?.layout) {
+      const userAttrs = { ...user._attributes };
+      const plugin = userAttrs.layout.plugin;
+      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(),
+      });
+    }
+    res.json({ success: "ok", reload_page: true });
+  })
+);
+
 /**
  * @name get/new
  * @function
@@ -1178,6 +1406,7 @@ router.post(
       getState().getConfig("development_mode", false)
     ) {
       await plugin.delete();
+      await new PluginInstaller(plugin).remove();
       req.flash("success", req.__(`Module %s removed.`, plugin.name));
     } else {
       req.flash(
@@ -1241,7 +1470,12 @@ router.post(
       res.redirect(`/plugins`);
       return;
     }
-    await load_plugins.loadAndSaveNewPlugin(plugin, forceReInstall);
+    const msgs = await load_plugins.loadAndSaveNewPlugin(
+      plugin,
+      forceReInstall,
+      undefined,
+      req.__
+    );
     const plugin_module = getState().plugins[name];
     await sleep(1000); // Allow other workers to load this plugin
     await getState().refresh_views();
@@ -1255,9 +1489,11 @@ router.post(
           plugin_db.name
         )
       );
+      if (msgs?.length > 0) req.flash("warning", msgs.join("<br>"));
       res.redirect(`/plugins/configure/${plugin_db.name}`);
     } else {
       req.flash("success", req.__(`Module %s installed`, plugin.name));
+      if (msgs?.length > 0) req.flash("warning", msgs.join("<br>"));
       res.redirect(`/plugins`);
     }
   })

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,
       });
     }

package/routes/tables.js

@@ -167,6 +167,10 @@ const tableForm = async (table, req) => {
               label: req.__("Version history"),
               sublabel: req.__("Track table data changes over time"),
               name: "versioned",
+              attributes: {
+                onChange:
+                  "if(!this.checked && !confirm('Are you sure? This will delete all history')) {this.checked = true; return false}",
+              },
               type: "Bool",
             },
             ...(table.name === "users"

package/serve.js

@@ -105,7 +105,7 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
   // migrate database
   if (!disableMigrate) await migrate(db.connectObj.default_schema, true);
   // load all plugins
-  await loadAllPlugins();
+  await loadAllPlugins(true);
   // switch on sql logging - but it was initiated before???
   if (getState().getConfig("log_sql", false)) db.set_sql_logging();
   if (db.is_it_multi_tenant()) {

package/tests/page.test.js

@@ -30,7 +30,17 @@ const prepHtmlFiles = async () => {
     const html = `<html><head><title>Landing page</title></head><body><h1>${content}</h1></body></html>`;
     if (!existsSync(scFolder)) await File.new_folder(folder);
     if (!existsSync(join(scFolder, name))) {
-      return await File.from_contents(name, "text/html", html, 1, 1, folder);
+      const file = await File.from_contents(
+        name,
+        "text/html",
+        html,
+        1,
+        1,
+        folder
+      );
+      file.location = File.absPathToServePath(file.location);
+
+      return file;
     } else {
       const file = await File.from_file_on_disk(name, scFolder);
       fs.writeFileSync(file.location, html);