@saltcorn/server 1.1.3-beta.8 → 1.1.3-rc.0

package/public/saltcorn-common.js

@@ -597,6 +597,7 @@ function get_form_record(e_in, select_labels) {
       $(e_in).prop("data-join-values", {});
       const keyVals = {};
       for (const { ref, target, refTable } of joinFields) {
+        if (!rec[ref]) continue;
         keyVals[ref] = rec[ref];
         $.ajax(`/api/${refTable}?id=${rec[ref]}`, {
           success: (val) => {
@@ -913,6 +914,29 @@ function doMobileTransforms() {
   );
 }
 
+function validate_expression_elem(target) {
+  const next = target.next();
+  if (next.hasClass("expr-error")) next.remove();
+  const val = target.val();
+  if (target.hasClass("validate-expression-conditional")) {
+    const box = target
+      .closest(".form-namespace")
+      .find(`[name="${target.attr("name")}_formula"]`);
+    if (!box.prop("checked")) return;
+  }
+  if (!val) return;
+  try {
+    const AsyncFunction = Object.getPrototypeOf(
+      async function () {}
+    ).constructor;
+    AsyncFunction("return " + val);
+  } catch (error) {
+    target.after(`<small class="text-danger font-monospace d-block expr-error">
+    ${error.message}
+  </small>`);
+  }
+}
+
 function initialize_page() {
   if (window._sc_locale && window.dayjs) dayjs.locale(window._sc_locale);
   const isNode = getIsNode();
@@ -942,28 +966,6 @@ function initialize_page() {
     validate_identifier_elem(target);
   });
 
-  const validate_expression_elem = (target) => {
-    const next = target.next();
-    if (next.hasClass("expr-error")) next.remove();
-    const val = target.val();
-    if (target.hasClass("validate-expression-conditional")) {
-      const box = target
-        .closest(".form-namespace")
-        .find(`[name="${target.attr("name")}_formula"]`);
-      if (!box.prop("checked")) return;
-    }
-    if (!val) return;
-    try {
-      const AsyncFunction = Object.getPrototypeOf(
-        async function () {}
-      ).constructor;
-      AsyncFunction("return " + val);
-    } catch (error) {
-      target.after(`<small class="text-danger font-monospace d-block expr-error">
-      ${error.message}
-    </small>`);
-    }
-  };
   $(".validate-expression").bind("input", function (e) {
     const target = $(e.target);
     validate_expression_elem(target);
@@ -1193,6 +1195,7 @@ function initialize_page() {
           if (_sc_lightmode === "dark") cmOpts.theme = "blackboard";
           const cm = CodeMirror.fromTextArea(el, cmOpts);
           $(el).addClass("codemirror-enabled");
+          if ($(el).hasClass("enlarge-in-card")) enlarge_in_code($(el), cm);
           cm.on(
             "change",
             $.debounce(
@@ -1295,6 +1298,22 @@ function initialize_page() {
 
 $(initialize_page);
 
+function enlarge_in_code($textarea, cm) {
+  const $card = $textarea.closest("div.card");
+  if (!$card.length) return;
+  const cardTop = $card.position().top;
+  const cardHeight = $card.height();
+  const vh = $(window).height();
+  const cmHeight = cm.getWrapperElement().offsetHeight;
+  const newCardHeight = vh - cardTop - 35;
+  if (newCardHeight > cardHeight) {
+    const extending = newCardHeight - cardHeight;
+    cm.setSize("100%", `${cmHeight + extending}px`);
+    cm.refresh();
+    $card.css("min-height", newCardHeight + "px");
+  }
+}
+
 function cancel_inline_edit(e, opts1) {
   var opts = JSON.parse(decodeURIComponent(opts1 || "") || "{}");
   var form = $(e.target).closest("form");
@@ -1563,7 +1582,7 @@ function notifyAlert(note, spin) {
     type = "info";
     txt = JSON.stringify(note, null, 2);
   }
-  
+
   const { id, html } = buildToast(txt, type, spin, note.toast_title);
   let $modal = $("#scmodal");
   if ($modal.length && $modal.hasClass("show"))
@@ -1750,6 +1769,21 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
   }
 }
 
+function editAllowedAuthByRole(id, event) {  
+  ajax_post_json(
+    `/roleadmin/setrole_allowed_auth_methods/${id}`,
+    {
+      enabled: event.target.checked,
+      method: event.target.value,
+    },
+    {
+      complete() {
+        location.reload();
+      },
+    }
+  );
+}
+
 function reloadEmbeddedEditOwnViews(form, id) {
   form.find("div[sc-load-on-assign-id]").each(function () {
     const $e = $(this);

package/routes/actions.js

@@ -1526,13 +1526,13 @@ router.get(
 
     const wfTable = mkTable(
       [
-        { label: "Trigger", key: (run) => trNames[run.trigger_id] },
-        { label: "Started", key: (run) => localeDateTime(run.started_at) },
+        { label: req.__("Trigger"), key: (run) => trNames[run.trigger_id] },
+        { label: req.__("Started"), key: (run) => localeDateTime(run.started_at) },
         {
-          label: "Updated",
+          label: req.__("Updated"),
           key: (run) => localeDateTime(run.status_updated_at),
         },
-        { label: "Status", key: "status" },
+        { label: req.__("Status"), key: "status" },
         {
           label: "",
           key: (run) => {
@@ -1743,6 +1743,7 @@ router.get(
       const title = run.wait_info.output ? "Workflow output" : "Fill form";
       res.sendWrap(title, renderForm(form, req.csrfToken()));
     } catch (e) {
+      console.error(e);
       await run.markAsError(e, step, req.user);
       const title = req.__("Error running workflow");
       res.sendWrap(title, renderForm(e.message, req.csrfToken()));

package/routes/admin.js

@@ -307,7 +307,12 @@ router.get(
         .replace(/^(\.\.(\/|\\|$))+/, "");
       const fullpath = path.join(location, "help", safeFile);
       if (fs.existsSync(fullpath)) {
-        const { markup } = await get_help_markup(fullpath, req.query, req, true);
+        const { markup } = await get_help_markup(
+          fullpath,
+          req.query,
+          req,
+          true
+        );
 
         res.sendWrap(`Help: ${topic}`, { above: [markup] });
       } else {
@@ -753,11 +758,13 @@ router.post(
       );
     }
     res.redirect(
-      type === "trigger"
-        ? `/actions`
-        : /^[a-z]+$/g.test(type)
-          ? `/${type}edit`
-          : "/"
+      type == "codepage"
+        ? `/admin/edit-codepage/${name}`
+        : type === "trigger"
+          ? `/actions`
+          : /^[a-z]+$/g.test(type)
+            ? `/${type}edit`
+            : "/"
     );
   })
 );
@@ -1140,6 +1147,7 @@ router.post(
       else
         req.flash("success", req.__("No changes detected, snapshot skipped"));
     } catch (e) {
+      console.error(e);
       req.flash("error", e.message);
     }
     res.json({ reload_page: true });
@@ -1636,6 +1644,7 @@ const doInstall = async (req, res, version, deepClean, runPull) => {
       try {
         await cleanNodeModules();
       } catch (e) {
+        console.error(e);
         res_write(req.__("Error cleaning node_modules: %s\n", e.message));
       }
     }
@@ -1896,6 +1905,7 @@ router.post(
           notify: "Certificate added, please restart server",
         });
       } catch (e) {
+        console.error(e);
         res.json({ error: e.message });
       }
     } else {
@@ -1983,6 +1993,7 @@ router.post(
         );
         res.redirect("/useradmin/ssl");
       } catch (e) {
+        console.error(e);
         req.flash("error", e.message);
         res.redirect("/useradmin/ssl");
       }
@@ -4098,15 +4109,6 @@ router.get(
       values: { code: existing },
       noSubmitButton: true,
       labelCols: 0,
-      additionalButtons: [
-        {
-          label: req.__("Delete code page"),
-          class: "btn btn-outline-danger btn-sm",
-          onclick: `if(confirm('Are you sure you would like to delete this code page?'))ajax_post('/admin/delete-codepage/${encodeURIComponent(
-            name
-          )}')`,
-        },
-      ],
       fields: [
         {
           name: "code",
@@ -4123,7 +4125,7 @@ router.get(
             ),
           input_type: "code",
           attributes: { mode: "text/javascript" },
-          class: "validate-statements",
+          class: "validate-statements enlarge-in-card",
           validator(s) {
             try {
               let AsyncFunction = Object.getPrototypeOf(
@@ -4143,7 +4145,8 @@ router.get(
       {}
     );
     const tags = await Tag.find();
-    const tagMarkup = div(
+    const tagMarkup = span(
+      { class: "ms-1" },
       "Tags:",
       (function_code_pages_tags[name] || []).map((tagnm) =>
         span(
@@ -4205,7 +4208,28 @@ router.get(
       contents: {
         type: "card",
         title: req.__(`%s code page`, name),
-        contents: [renderForm(form, req.csrfToken()), tagMarkup],
+        contents: [
+          renderForm(form, req.csrfToken()),
+          a(
+            {
+              href: `javascript:if(confirm('Are you sure you would like to delete this code page?'))ajax_post('/admin/delete-codepage/${encodeURIComponent(
+                name
+              )}')`,
+              class: "me-1 text-danger",
+            },
+            req.__("Delete code page")
+          ),
+          " | ",
+          a(
+            {
+              href: `javascript:ajax_modal('/admin/snapshot-restore/codepage/${name}')`,
+              class: "ms-1 me-1",
+            },
+            req.__("Restore")
+          ),
+          " | ",
+          tagMarkup,
+        ],
       },
     });
   })
@@ -4223,9 +4247,9 @@ router.post(
       ...code_pages,
       [name]: code,
     });
-    await getState().refresh_codepages();
-
-    res.json({ success: true });
+    const err = await getState().refresh_codepages();
+    if (err) res.json({ success: false, error: `Error evaluating code pages: ${err}` });
+    else res.json({ success: true });
   })
 );
 router.post(

package/routes/common_lists.js

@@ -93,7 +93,8 @@ const tablesList = async (
               {
                 label: tagsDropdown(
                   tags,
-                  filterOnTag ? `Tag:${filterOnTag.name}` : undefined
+                  filterOnTag ? `Tag:${filterOnTag.name}` : undefined,
+                  req
                 ),
                 key: (r) => tagBadges(r),
               },
@@ -240,7 +241,7 @@ const tagBadge = (tag, type) =>
     tag.name
   );
 
-const tagsDropdown = (tags, altHeader) =>
+const tagsDropdown = (tags, altHeader, req) =>
   div(
     { class: "dropdown" },
     div(
@@ -253,7 +254,7 @@ const tagsDropdown = (tags, altHeader) =>
         "aria-haspopup": "true",
         "aria-expanded": "false",
       },
-      altHeader || "Tags",
+      altHeader || req.__("Tags"),
       i({ class: "ms-1 fas fa-caret-down" })
     ),
     div(
@@ -267,7 +268,7 @@ const tagsDropdown = (tags, altHeader) =>
           // TODO check url why view for page, what do we need for page group
           href: `javascript:unset_state_field('_tag', this)`,
         },
-        "All tags"
+        req.__("All tags")
       ),
       tags.map((tag) =>
         a(
@@ -285,7 +286,7 @@ const tagsDropdown = (tags, altHeader) =>
           // TODO check url why view for page, what do we need for page group
           href: `tag`,
         },
-        "Manage tags..."
+        req.__("Manage tags...")
       )
     )
   );
@@ -314,7 +315,7 @@ const mkAddBtn = (tags, entityType, id, req, myTagIds, on_done_redirect_str) =>
           post_dropdown_item(
             `/tag-entries/add-tag-entity/${encodeURIComponent(
               t.name
-            )}/${entityType}/${id}${on_done_redirect_str||""}`,
+            )}/${entityType}/${id}${on_done_redirect_str || ""}`,
             t.name,
             req
           )
@@ -345,7 +346,14 @@ const viewsList = async (
   const tagBadges = (view) => {
     const myTags = tag_entries.filter((te) => te.view_id === view.id);
     const myTagIds = new Set(myTags.map((t) => t.tag_id));
-    const addBtn = mkAddBtn(tags, "views", view.id, req, myTagIds, on_done_redirect_str);
+    const addBtn = mkAddBtn(
+      tags,
+      "views",
+      view.id,
+      req,
+      myTagIds,
+      on_done_redirect_str
+    );
     return (
       myTags.map((te) => tagBadge(tagsById[te.tag_id], "views")).join(nbsp) +
       addBtn
@@ -380,7 +388,8 @@ const viewsList = async (
               {
                 label: tagsDropdown(
                   tags,
-                  filterOnTag ? `Tag:${filterOnTag.name}` : undefined
+                  filterOnTag ? `Tag:${filterOnTag.name}` : undefined,
+                  req
                 ),
                 key: (r) => tagBadges(r),
               },
@@ -585,7 +594,8 @@ const getPageList = async (
             {
               label: tagsDropdown(
                 tags,
-                filterOnTag ? `Tag:${filterOnTag.name}` : undefined
+                filterOnTag ? `Tag:${filterOnTag.name}` : undefined,
+                req
               ),
               key: (r) => tagBadges(r),
             },
@@ -709,7 +719,14 @@ const getTriggerList = async (
     const myTagIds = new Set(myTags.map((t) => t.tag_id));
     return (
       myTags.map((te) => tagBadge(tagsById[te.tag_id], "triggers")).join(nbsp) +
-      mkAddBtn(tags, "triggers", trigger.id, req, myTagIds, on_done_redirect_str)
+      mkAddBtn(
+        tags,
+        "triggers",
+        trigger.id,
+        req,
+        myTagIds,
+        on_done_redirect_str
+      )
     );
   };
   return mkTable(
@@ -729,7 +746,8 @@ const getTriggerList = async (
             {
               label: tagsDropdown(
                 tags,
-                filterOnTag ? `Tag:${filterOnTag.name}` : undefined
+                filterOnTag ? `Tag:${filterOnTag.name}` : undefined,
+                req
               ),
               key: (r) => tagBadges(r),
             },

package/routes/delete.js

@@ -57,6 +57,7 @@ router.post(
           req.__("Not allowed to write to table %s", table.name)
         );
     } catch (e) {
+      console.error(e);
       req.flash("error", e.message);
     }
     if (req.xhr) res.send("OK");

package/routes/fields.js

@@ -322,6 +322,7 @@ const fieldFlow = (req) =>
             }
           );
         } catch (e) {
+          console.error(e);
           return {
             redirect: `/table/${context.table_id}`,
             flash: ["error", e.message],
@@ -340,6 +341,7 @@ const fieldFlow = (req) =>
             }
           );
         } catch (e) {
+          console.error(e);
           return {
             redirect: `/table/${context.table_id}`,
             flash: ["error", e.message],

package/routes/infoarch.js

@@ -90,6 +90,7 @@ router.post(
       else
         req.flash("success", req.__("No changes detected, snapshot skipped"));
     } catch (e) {
+      console.error(e);
       req.flash("error", e.message);
     }
     res.json({ reload_page: true });

package/routes/menu.js

@@ -615,6 +615,7 @@ router.post(
         });
         res.json({ success: "ok", ...(result || {}) });
       } catch (e) {
+        console.error(e);
         res.status(400).json({ error: e.message || e });
       }
     else res.status(404).json({ error: "Action not found" });

package/routes/page_groupedit.js

@@ -628,6 +628,7 @@ router.post(
           );
           res.redirect(`/page_groupedit/${group.name}`);
         } catch (e) {
+          console.error(e);
           req.flash("error", e.message);
           res.redirect(`/page_groupedit/${group.name}`);
         }

package/routes/plugins.js

@@ -1489,6 +1489,7 @@ router.post(
         for (const msg of msgs) req.flash("warning", msg);
         res.redirect(`/plugins`);
       } catch (e) {
+        console.error(e);
         req.flash("error", `${e.message}`);
         const form = pluginForm(req, plugin);
         res.sendWrap(req.__(`Edit Module`), renderForm(form, req.csrfToken()));
@@ -1595,6 +1596,7 @@ router.post(
         req.__
       );
     } catch (e) {
+      console.error(e);
       req.flash(
         "error",
         e.message || req.__("Error installing module %s", plugin.name)

package/routes/registry.js

@@ -145,6 +145,7 @@ router.get(
             name: "regval",
             label: "",
             input_type: "code",
+            class: "enlarge-in-card",
             attributes: { mode: "application/json" },
           },
         ],
@@ -319,13 +320,16 @@ router.get(
             ),
           },
           {
-            type: "card",
-            title: cfg_link
-              ? `Registry editor: ${cfg_link}`
-              : ename && etype
-              ? `Registry editor: ${ename} ${etype}`
-              : "Registry editor",
-            contents: edContents,
+            type: "container",
+            contents: {
+              type: "card",
+              title: cfg_link
+                ? `Registry editor: ${cfg_link}`
+                : ename && etype
+                  ? `Registry editor: ${ename} ${etype}`
+                  : "Registry editor",
+              contents: edContents,
+            },
           },
         ],
       },

package/routes/scapi.js

@@ -25,7 +25,13 @@ const {
   stateFieldsToWhere,
   readState,
 } = require("@saltcorn/data/plugin-helper");
-const { getState } = require("@saltcorn/data/db/state");
+const {
+  getState,
+  process_send,
+  add_tenant,
+} = require("@saltcorn/data/db/state");
+const db = require("@saltcorn/data/db");
+const { loadAllPlugins } = require("../load_plugins");
 
 /**
  * @type {object}
@@ -49,8 +55,8 @@ function accessAllowedRead(req, user) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 100;
+        ? user.role_id
+        : 100;
 
   if (role === 1) return true;
   return false;
@@ -326,3 +332,33 @@ router.get(
     )(req, res, next);
   })
 );
+
+router.post(
+  "/reload",
+  error_catcher(async (req, res, next) => {
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedRead(req, user)) {
+          const { tenant, new_tenant } = req.body;
+          if (new_tenant) {
+            add_tenant(new_tenant);
+
+            await db.runWithTenant(new_tenant, loadAllPlugins);
+
+            process_send({ createTenant: new_tenant });
+          }
+          if (tenant) {
+            await db.runWithTenant(tenant, async () => {
+              await getState().refresh_plugins();
+            });
+          } else await getState().refresh_plugins();
+          res.json({ success: true });
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
+);

package/routes/tables.js

@@ -2219,6 +2219,7 @@ router.post(
       await table.deleteRows({}, req.user, true);
       req.flash("success", req.__("Deleted all rows"));
     } catch (e) {
+      console.error(e)
       req.flash("error", e.message);
     }
 
@@ -2475,20 +2476,6 @@ router.post(
       },
       edit.id
     );
-    const add_to_menu = async (item) => {
-      const current_menu = getState().getConfigCopy("menu_items", []);
-      const existing = current_menu.findIndex((m) => m.label === item.label);
-      if (existing >= 0) current_menu[existing] = item;
-      else current_menu.push(item);
-      await save_menu_items(current_menu);
-    };
-
-    await add_to_menu({
-      label: table.name,
-      type: "View",
-      min_role: 100,
-      viewname: `List ${table.name}`,
-    });
 
     res.redirect(`/table/${table.id}`);
   })

package/routes/utils.js

@@ -164,7 +164,7 @@ const set_custom_http_headers = (res, req, state) => {
         validateHeaderName(k);
         validateHeaderValue(k, val);
         res.header(k, val);
-      } catch (e) {
+      } catch (e) {      
         Crash.create(e, { url: "/", headers: {} });
       }
     }
@@ -504,6 +504,7 @@ const sendHtmlFile = async (req, res, file) => {
         .sendWrap(req.__("An error occurred"), req.__("File not found"));
     }
   } catch (e) {
+    console.error(e)
     return res
       .status(404)
       .sendWrap(