@saltcorn/server 0.9.5-beta.8 → 0.9.5

package/routes/api.js

@@ -373,7 +373,10 @@ router.all(
               res.redirect(resp.goto);
             else if (req.headers?.scgotourl)
               res.redirect(req.headers?.scgotourl);
-            else res.json({ success: true, data: resp });
+            else {
+              if (trigger.configuration?._raw_output) res.json({ resp });
+              else res.json({ success: true, data: resp });
+            }
           } catch (e) {
             Crash.create(e, req);
             res.status(400).json({ success: false, error: e.message });

package/routes/fields.js

@@ -251,6 +251,16 @@ const fieldFlow = (req) =>
             : ""
         }row).${model_output}`;
       }
+      if (context.expression_type === "Aggregation") {
+        expression = "__aggregation";
+        attributes.agg_relation = context.agg_relation;
+        attributes.agg_field = context.agg_field;
+        attributes.aggwhere = context.aggwhere;
+        attributes.aggregate = context.aggregate;
+        const [table, ref] = context.agg_relation.split(".");
+        attributes.table = table;
+        attributes.ref = ref;
+      }
       const { reftable_name, type } = calcFieldType(context.type);
       const fldRow = {
         table_id,
@@ -421,6 +431,50 @@ const fieldFlow = (req) =>
             );
             output_options[model.name] = outputs.map((o) => o.name);
           }
+          const aggStatOptions = {};
+
+          const { child_field_list, child_relations } =
+            await table.get_child_relations(true);
+          const agg_field_opts = child_relations.map(
+            ({ table, key_field, through }) => {
+              const aggKey =
+                (through ? `${through.name}->` : "") +
+                `${table.name}.${key_field.name}`;
+              aggStatOptions[aggKey] = [
+                "Count",
+                "CountUnique",
+                "Avg",
+                "Sum",
+                "Max",
+                "Min",
+                "Array_Agg",
+              ];
+              table.fields.forEach((f) => {
+                if (f.type && f.type.name === "Date") {
+                  aggStatOptions[aggKey].push(`Latest ${f.name}`);
+                  aggStatOptions[aggKey].push(`Earliest ${f.name}`);
+                }
+              });
+              return {
+                name: `agg_field`,
+                label: req.__("On Field"),
+                type: "String",
+                required: true,
+                attributes: {
+                  options: table.fields
+                    .filter((f) => !f.calculated || f.stored)
+                    .map((f) => ({
+                      label: f.name,
+                      name: `${f.name}@${f.type_name}`,
+                    })),
+                },
+                showIf: {
+                  agg_relation: aggKey,
+                  expression_type: "Aggregation",
+                },
+              };
+            }
+          );
           return new Form({
             fields: [
               {
@@ -429,9 +483,43 @@ const fieldFlow = (req) =>
                 input_type: "select",
                 options: [
                   "JavaScript expression",
+                  ...(child_relations.length && context.stored
+                    ? ["Aggregation"]
+                    : []),
                   ...(models.length ? ["Model prediction"] : []),
                 ],
               },
+              {
+                name: "agg_relation",
+                label: req.__("Relation"),
+                type: "String",
+                required: true,
+                attributes: {
+                  options: child_field_list,
+                },
+                showIf: { expression_type: "Aggregation" },
+              },
+              ...agg_field_opts,
+              {
+                name: "aggregate",
+                label: req.__("Statistic"),
+                type: "String",
+                required: true,
+                attributes: {
+                  calcOptions: ["agg_relation", aggStatOptions],
+                },
+
+                showIf: { expression_type: "Aggregation" },
+              },
+              {
+                name: "aggwhere",
+                label: req.__("Where"),
+                sublabel: req.__("Formula"),
+                class: "validate-expression",
+                type: "String",
+                required: false,
+                showIf: { expression_type: "Aggregation" },
+              },
               {
                 name: "model",
                 label: req.__("Model"),
@@ -487,7 +575,9 @@ const fieldFlow = (req) =>
               new Field({
                 name: "test_btn",
                 label: req.__("Test"),
-                showIf: { expression_type: "JavaScript expression" },
+                showIf: {
+                  expression_type: ["JavaScript expression"],
+                },
                 // todo sublabel
                 input_type: "custom_html",
                 attributes: {
@@ -652,6 +742,9 @@ router.get(
       {
         ...field.toJson,
         ...field.attributes,
+        ...(field.expression === "__aggregation"
+          ? { expression_type: "Aggregation" }
+          : {}),
       },
       req
     );
@@ -955,8 +1048,11 @@ router.post(
             }
             return;
           }
+        }
+        if (targetField.type === "File") {
+          fv = getState().fileviews[fieldview];
         } else {
-          fv = targetField.type.fieldviews[fieldview];
+          fv = targetField.type?.fieldviews?.[fieldview];
           if (!fv)
             fv =
               targetField.type.fieldviews.show ||
@@ -994,13 +1090,15 @@ router.post(
         if (oldRow) {
           const value = oldRow[kpath[kpath.length - 1]];
           //TODO run fieldview
-          res.send(
-            typeof value === "string"
-              ? value
-              : value?.toString
-              ? value.toString()
-              : `${value}`
-          );
+          if (value === null || typeof value === "undefined") res.send("");
+          else
+            res.send(
+              typeof value === "string"
+                ? value
+                : value?.toString
+                ? value.toString()
+                : `${value}`
+            );
           return;
         }
       }

package/routes/menu.js

@@ -19,7 +19,7 @@ const { save_menu_items } = require("@saltcorn/data/models/config");
 const db = require("@saltcorn/data/db");
 
 const { renderForm } = require("@saltcorn/markup");
-const { script, domReady, div, ul } = require("@saltcorn/markup/tags");
+const { script, domReady, div, ul, i } = require("@saltcorn/markup/tags");
 const { send_infoarch_page } = require("../markup/admin.js");
 const Table = require("@saltcorn/data/models/table");
 const Trigger = require("@saltcorn/data/models/trigger");
@@ -368,7 +368,7 @@ const menuEditorScript = (menu_items) => `
               iconPicker: iconPickerOptions,
               getLabelText: (item) => item?.text || item?.type,
               labelEdit: 'Edit&nbsp;<i class="fas fa-edit clickable"></i>',
-              maxLevel: 1 // (Optional) Default is -1 (no level limit)
+              maxLevel: 2 // (Optional) Default is -1 (no level limit)
               // Valid levels are from [0, 1, 2, 3,...N]
               });
   editor.setForm($('#menuForm'));
@@ -446,7 +446,16 @@ router.get(
           above: [
             {
               besides: [
-                div(ul({ id: "myEditor", class: "sortableLists list-group" })),
+                div(
+                  ul({ id: "myEditor", class: "sortableLists list-group" }),
+                  div(
+                    i(
+                      req.__(
+                        "Some themes support only one level of menu nesting."
+                      )
+                    )
+                  )
+                ),
                 div(
                   renderForm(form, req.csrfToken()),
                   script(domReady(menuEditorScript(menu_items)))

package/routes/page.js

@@ -135,7 +135,13 @@ router.get(
   "/:pagename",
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
-    getState().log(3, `Route /page/${pagename} user=${req.user?.id}`);
+    const state = getState();
+    state.log(
+      3,
+      `Route /page/${pagename} user=${req.user?.id}${
+        state.getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
+      }`
+    );
     const tic = new Date();
     const { page, pageGroup } = findPageOrGroup(pagename);
     if (page) await runPage(page, req, res, tic);
@@ -144,7 +150,7 @@ router.get(
       if ((page || pageGroup) && !req.user) {
         res.redirect(`/auth/login?dest=${encodeURIComponent(req.originalUrl)}`);
       } else {
-        getState().log(2, `Page ${pagename} not found or not authorized`);
+        state.log(2, `Page ${pagename} not found or not authorized`);
         res
           .status(404)
           .sendWrap(

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,
@@ -362,7 +363,9 @@ const storeNavPills = (req) => {
       { class: "nav-item" },
       a(
         {
-          href: `/plugins?set=${txt.toLowerCase()}`,
+          href: `/plugins?set=${txt.toLowerCase()}${
+            req.query.q ? `&q=${req.query.q}` : ""
+          }`,
           class: [
             "nav-link",
             (req.query.set === txt.toLowerCase() ||
@@ -546,6 +549,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
@@ -697,7 +710,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 +723,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,17 +794,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");
     }
   })
@@ -799,22 +827,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
@@ -866,8 +1095,15 @@ router.get(
       const fullpath = path.join(location, "public", safeFile);
       if (fs.existsSync(fullpath))
         res.sendFile(fullpath, { maxAge: hasVersion ? "100d" : "1d" });
-      else res.status(404).send(req.__("Not found"));
+      else {
+        getState().log(6, `Plugin serve public: file not found ${fullpath}`);
+        res.status(404).send(req.__("Not found"));
+      }
     } else {
+      getState().log(
+        6,
+        `Plugin serve public: No location for plugin: ${plugin}`
+      );
       res.status(404).send(req.__("Not found"));
     }
   })