@saltcorn/server 0.9.5-beta.14 → 0.9.5-beta.15

package/auth/routes.js

@@ -45,6 +45,7 @@ const {
   p,
   script,
   domReady,
+  button,
 } = require("@saltcorn/markup/tags");
 const {
   available_languages,
@@ -1362,6 +1363,57 @@ const userSettings = async ({ req, res, pwform, user }) => {
           ),
       ],
     };
+  let themeCfgCard;
+  const layoutPlugin = getState().getLayoutPlugin(user);
+  const modNames = getState().plugin_module_names;
+  const pluginName = layoutPlugin.plugin_name;
+  let safeName = pluginName;
+  for (const [k, v] of Object.entries(modNames)) {
+    if (v === pluginName) safeName = k;
+  }
+
+  const hasUserConfigs =
+    layoutPlugin.user_config_form &&
+    (await layoutPlugin.user_config_form(
+      getState().plugin_cfgs[pluginName] || {}
+    )) !== null;
+  themeCfgCard = {
+    type: "card",
+    title: req.__("Layout"),
+    contents: [
+      div(
+        hasUserConfigs
+          ? req.__("Adjust the the theme for this user")
+          : req.__("The current theme has no user specific settings")
+      ),
+      hasUserConfigs
+        ? div(
+            {
+              class: "mt-4",
+            },
+
+            a(
+              {
+                class: "btn btn-primary",
+                role: "button",
+                href: `/plugins/user_configure/${encodeURIComponent(safeName)}`,
+                title: req.__("Configure theme"),
+              },
+              req.__("Configure")
+            ),
+            button(
+              {
+                class: "btn btn-primary ms-2",
+                onclick: "ajax_post('/plugins/remove_user_layout')",
+                title: req.__("Remove all user specific theme settings"),
+              },
+              req.__("Reset")
+            )
+          )
+        : "",
+    ],
+  };
+
   return {
     above: [
       {
@@ -1434,6 +1486,7 @@ const userSettings = async ({ req, res, pwform, user }) => {
           ]
         : []),
       ...(apikeycard ? [apikeycard] : []),
+      ...(themeCfgCard ? [themeCfgCard] : []),
     ],
   };
 };

package/load_plugins.js

@@ -35,6 +35,10 @@ const loadPlugin = async (plugin, force) => {
       res.name
     );
   } catch (error) {
+    getState().log(
+      3,
+      `Error loading plugin ${plugin.name}: ${error.message || error}`
+    );
     if (force) {
       // remove the install dir and try again
       await loader.remove();
@@ -48,6 +52,7 @@ const loadPlugin = async (plugin, force) => {
       );
     }
   }
+  if (res.plugin_module.user_config_form) getState().refreshUserLayouts();
   if (res.plugin_module.onLoad) {
     try {
       await res.plugin_module.onLoad(plugin.configuration);
@@ -83,6 +88,7 @@ const loadAllPlugins = async (force) => {
       console.error(e);
     }
   }
+  await getState().refreshUserLayouts();
   await getState().refresh(true);
 };
 

package/locales/en.json

@@ -1394,5 +1394,10 @@
 	"The plugin was corrupted and had to be repaired. We recommend restarting your server.": "The plugin was corrupted and had to be repaired. We recommend restarting your server.",
 	"%s code page": "%s code page",
 	"Constants and function code": "Constants and function code",
-	"Delete code page": "Delete code page"
+	"Delete code page": "Delete code page",
+	"Adjust the the theme for this user": "Adjust the the theme for this user",
+	"Configure theme": "Configure theme",
+	"Remove all user specific theme settings": "Remove all user specific theme settings",
+	"Configure %s Plugin for %s": "Configure %s Plugin for %s",
+	"The current theme has no user specific settings": "The current theme has no user specific settings"
 }

package/package.json

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

package/public/saltcorn-common.js

@@ -1184,8 +1184,10 @@ async function common_done(res, viewname, isWeb = true) {
     await handle(res.notify_success, (text) =>
       notifyAlert({ type: "success", text: text })
     );
-  if (res.set_fields && viewname) {
-    const form = $(`form[data-viewname="${viewname}"]`);
+  if (res.set_fields && (viewname || res.set_fields._viewname)) {
+    const form = $(
+      `form[data-viewname="${res.set_fields._viewname || viewname}"]`
+    );
     if (form.length === 0 && set_state_fields) {
       // assume this is a filter
       set_state_fields(
@@ -1195,6 +1197,7 @@ async function common_done(res, viewname, isWeb = true) {
       );
     } else {
       Object.keys(res.set_fields).forEach((k) => {
+        if (k === "_viewname") return;
         const input = form.find(
           `input[name=${k}], textarea[name=${k}], select[name=${k}]`
         );

package/public/saltcorn.js

@@ -522,6 +522,7 @@ function applyViewConfig(e, url, k, event) {
     cfg[item.name] = item.value;
   });
   ajax_indicator(true, e);
+  window.savingViewConfig = true;
   $.ajax(url, {
     type: "POST",
     dataType: "json",
@@ -531,9 +532,11 @@ function applyViewConfig(e, url, k, event) {
     },
     data: JSON.stringify(cfg),
     error: function (request) {
+      window.savingViewConfig = false;
       ajax_indicate_error(e, request);
     },
     success: function (res) {
+      window.savingViewConfig = false;
       ajax_indicator(false);
       k && k(res);
       !k && updateViewPreview();

package/restart_watcher.js

@@ -16,6 +16,7 @@ const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
 const relevantPackages = [
   "db-common",
   "common-code",
+  "plugins-loader",
   "postgres",
   "saltcorn-data",
   "saltcorn-builder",

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,
@@ -697,7 +698,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 = `${
@@ -705,25 +711,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()),
+          },
+        ],
+      }
+    );
   })
 );
 
@@ -770,7 +782,8 @@ 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();
@@ -781,6 +794,7 @@ router.post(
         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");
     }
   })
@@ -799,22 +813,199 @@ 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,
+    });
+    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
+    );
+    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;
+      getState().processSend({
+        refresh_plugin_cfg: plugin,
+        tenant: db.getTenantSchema(),
+      });
+    }
+    res.json({ success: "ok", reload_page: true });
+  })
+);
+
 /**
  * @name get/new
  * @function