@saltcorn/server 1.4.0-beta.9 → 1.4.0-rc.1

package/public/saltcorn-common.js

@@ -74,8 +74,9 @@ function reset_nearest_form(that) {
   form.find("select").trigger("change");
 }
 
-function add_repeater(nm) {
-  var es = $("div.form-repeat.repeat-" + nm);
+function add_repeater(nm, add_link) {
+  const outer_repeat = $(add_link).prev();
+  var es = outer_repeat.find("div.form-repeat.repeat-" + nm);
   const ncopy = es.length - 1;
   var e = es.last();
   var newix = es.length;
@@ -83,15 +84,21 @@ function add_repeater(nm) {
   newe.find("[name]").each(function (ix, element) {
     if ($(element).hasClass("omit-repeater-clone")) $(element).remove();
     const oldnm = element.name || "";
-    var newnm = (element.name || "").replace("_" + ncopy, "_" + newix);
-    var newid = (element.id || "").replace("_" + ncopy, "_" + newix);
+    var newnm = (element.name || "").replace(
+      new RegExp("_" + ncopy + "$"),
+      "_" + newix
+    );
+    var newid = (element.id || "").replace(
+      new RegExp("_" + ncopy + "$"),
+      "_" + newix
+    );
     $(element).attr("name", newnm).attr("id", newid);
     if (element.tagName === "SELECT") {
       const original = document.getElementsByName(oldnm)[0];
       if (original) element.selectedIndex = original.selectedIndex;
     }
   });
-  newe.appendTo($("div.repeats-" + nm));
+  newe.appendTo(outer_repeat);
   newe.find("[data-on-cloned]").each(function (ix, element) {
     (function (str) {
       return eval(str);
@@ -1330,7 +1337,7 @@ function initialize_page() {
                   }
                 } else {
                   cm1.save();
-                  $(el).closest("form").trigger("change");
+                  $(el).trigger("change");
                 }
               },
               500,
@@ -1722,6 +1729,7 @@ function progress_toast_update({
   percent,
   blocking,
   maxHeight,
+  popupWidth,
 }) {
   if (close && blocking) {
     $("#scmodal .modal-body .progress-message").html("");
@@ -1736,8 +1744,9 @@ function progress_toast_update({
 
   if (blocking) {
     ensure_modal_exists_and_closed({ open: true, blocking: true }); // no close
+    $(".sc-modal-linkout").hide();
     $("#scmodal .modal-header button.btn-close").css("display", "none");
-
+    if (popupWidth) $(".modal-dialog").css("max-width", popupWidth);
     existing = $("#scmodal");
     if (title) $("#scmodal .modal-title").html(title);
     const exBody = $("#scmodal .modal-body .blocking-progress-modal");
@@ -2005,6 +2014,9 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
     let new_state = res.new_state || undefined;
     reload_embedded_view(res.reload_embedded_view, new_state);
   }
+  if (res.progress_bar_update) {
+    progress_toast_update(res.progress_bar_update);
+  }
   if (res.eval_js) await handle(res.eval_js, eval_it);
   /// TODO got and resume_workflow - use localStorage
   if (res.goto) {
@@ -2601,6 +2613,35 @@ function handle_identical_fields(event) {
   }
 }
 
+function toggle_header_filters(toggle_icon_elem) {
+  //console.log("toggle headers", elem);
+
+  const r = $(toggle_icon_elem).closest("thead").find("tr.header-filters")[0];
+  
+  //var r = document.getElementById("${filterRowId}");
+  if (r) {
+    var hidden =
+      r.style.display === "none" ||
+      window.getComputedStyle(r).display === "none";
+    if (hidden) {
+      r.style.display = "table-row";
+      var ic = toggle_icon_elem.querySelector("i");
+      if (ic) {
+        ic.classList.remove("fa-chevron-down");
+        ic.classList.add("fa-chevron-up");
+      }
+    } else {
+      r.style.display = "none";
+      var ic2 = toggle_icon_elem.querySelector("i");
+      if (ic2) {
+        ic2.classList.remove("fa-chevron-up");
+        ic2.classList.add("fa-chevron-down");
+      }
+    }
+  }
+  return false;
+}
+
 const observer = new IntersectionObserver(
   (entries, observer) => {
     entries.forEach((entry) => {

package/public/saltcorn.css

@@ -364,7 +364,8 @@ table.table-inner-grid td {
   color: #ddd;
 }
 .editStarRating input {
-  display: none;
+  opacity: 0;
+  width: 1px;
 }
 .editStarRating label:hover,
 .editStarRating label:hover ~ label,
@@ -896,6 +897,9 @@ input[type="file"].file-has-existing {
 .card-max-full-screen .card-body:focus {
   outline-width: 0;
 }
+.card-max-full-screen .card-body:focus-visible {
+  outline: none !important;
+}
 
 .blocking-progress-modal .progress-message {
   overflow: auto;

package/public/saltcorn.js

@@ -292,7 +292,7 @@ function view_post(viewnameOrElem, route, data, onDoneOrObj, sendState) {
   let onDone,
     sendState1,
     runAsync = false;
-  if (typeof onDoneOrObj === "object") {
+  if (onDoneOrObj && typeof onDoneOrObj === "object") {
     onDone = onDoneOrObj.onDone;
     sendState1 = onDoneOrObj.sendState;
     runAsync = onDoneOrObj.runAsync;
@@ -556,7 +556,7 @@ function saveAndContinue(e, k, event) {
   var form_data = form.serialize();
 
   if (form.prop("data-last-save-success") === form_data) {
-    if (k) k(res);
+    if (k) k(valres);
     return;
   }
 

package/routes/actions.js

@@ -126,7 +126,9 @@ router.get(
           {
             type: "card",
             class: "card-max-full-screen",
-            title: req.__("Triggers"),
+            title:
+              req.__("Triggers") +
+              `<a href="javascript:ajax_modal('/admin/help/Triggers')"><i class="fas fa-question-circle ms-1"></i></a>`,
             contents: div(
               triggers.length
                 ? await getTriggerList(triggers, req, { filterOnTag })
@@ -193,7 +195,7 @@ const triggerForm = async (req, trigger) => {
         label: req.__("Name"),
         type: "String",
         required: true,
-        attributes: { autofocus: true },
+        attributes: { autofocus: true, spellcheck: false },
         sublabel: req.__("Name of action"),
       },
       {
@@ -458,6 +460,7 @@ router.post(
         id = form.values.id;
         await Trigger.update(id, form.values);
       } else {
+        if (form.values.name) form.values.name = form.values.name.trim();
         const tr = await Trigger.create(form.values);
         id = tr.id;
       }
@@ -1074,6 +1077,7 @@ router.get(
       const cfgFields = await getActionConfigFields(action, table, {
         mode: "trigger",
         when_trigger: trigger.when_trigger,
+        old_config: trigger.configuration,
         req,
       });
       // create form
@@ -1133,6 +1137,7 @@ router.post(
       const cfgFields = await getActionConfigFields(action, table, {
         mode: "trigger",
         when_trigger: trigger.when_trigger,
+        old_config: trigger.configuration,
         req,
       });
       form = new Form({

package/routes/admin.js

@@ -123,6 +123,7 @@ const Docker = require("dockerode");
 const npmFetch = require("npm-registry-fetch");
 const Tag = require("@saltcorn/data/models/tag");
 const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer.js");
+const TableConstraint = require("@saltcorn/data/models/table_constraints");
 const MarkdownIt = require("markdown-it"),
   md = new MarkdownIt();
 
@@ -4193,7 +4194,6 @@ router.post(
       await getState().refresh_triggers();
     }
     if (form.values.tables) {
-      await db.deleteWhere("_sc_table_constraints");
       await db.deleteWhere("_sc_model_instances");
       await db.deleteWhere("_sc_models");
 
@@ -4201,6 +4201,12 @@ router.post(
       const tables = await Table.find({}, { orderBy: "id", orderDesc: true });
 
       for (const table of tables) {
+        const constraints = await TableConstraint.find({ table_id: table.id });
+
+        for (const con of constraints) {
+          await con.delete();
+        }
+
         await db.deleteWhere("_sc_triggers", {
           table_id: table.id,
         });
@@ -4215,6 +4221,18 @@ router.post(
       }
       for (const table of tables) {
         if (table.name !== "users") await table.delete();
+        else
+          // reset users table row
+          await table.update({
+            min_role_read: 1,
+            min_role_write: 1,
+            description: "",
+            ownership_formula: null,
+            ownership_field_id: null,
+            versioned: false,
+            has_sync_info: false,
+            is_user_group: false,
+          });
       }
     }
     if (form.values.files) {

package/routes/eventlog.js

@@ -222,7 +222,8 @@ router.get(
       //sub2_page: "Events to log",
       contents: {
         type: "card",
-        title: req.__("Custom Events"),
+        title: req.__("Custom Events")+
+          `<a href="javascript:ajax_modal('/admin/help/Custom%20events?')"><i class="fas fa-question-circle ms-1"></i></a>`,
         contents:
           mkTable(
             [

package/routes/homepage.js

@@ -19,7 +19,10 @@ const { div, a, p, i, h5, span, title } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const { get_cached_packs } = require("@saltcorn/admin-models/models/pack");
 // const { restore_backup } = require("../markup/admin");
-const { get_latest_npm_version } = require("@saltcorn/data/models/config");
+const {
+  get_latest_npm_version,
+  get_saltcorn_npm_versions,
+} = require("@saltcorn/data/models/config");
 const packagejson = require("../package.json");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { fileUploadForm } = require("../markup/forms");
@@ -524,19 +527,22 @@ const no_views_logged_in = async (req, res) => {
     res.sendWrap(req.__("Hello"), req.__("Welcome to Saltcorn!"));
   else {
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
-    const latest =
-      isRoot && (await get_latest_npm_version("@saltcorn/cli", 500));
+    const versions = isRoot && (await get_saltcorn_npm_versions(500));
+    const eligible_upgrades = versions?.filter(
+      (v) =>
+        semver.gt(v, packagejson.version) &&
+        (packagejson.version.includes("-") || !v?.includes("-"))
+    );
+    
     const can_update =
-      latest &&
-      semver.gt(latest, packagejson.version) &&
-      !process.env.SALTCORN_DISABLE_UPGRADE;
-    if (latest && can_update && isRoot)
+      eligible_upgrades?.length && !process.env.SALTCORN_DISABLE_UPGRADE;
+    if (can_update && isRoot)
       req.flash(
         "warning",
         req.__(
           "An upgrade to Saltcorn is available! Current version: %s; latest version: %s.",
           packagejson.version,
-          latest
+          eligible_upgrades[eligible_upgrades.length - 1]
         ) +
           " " +
           a({ href: "/admin/system" }, req.__("Upgrade here"))

package/routes/page_groupedit.js

@@ -415,6 +415,7 @@ router.post(
         await getState().refresh_page_groups();
         res.json({ success: "ok", row });
       } else {
+        row.name = row.name.trim();
         const pageGroup = await PageGroup.create(row);
         await getState().refresh_page_groups();
         res.redirect(`/page_groupedit/${pageGroup.name}`);

package/routes/pageedit.js

@@ -119,6 +119,10 @@ const pagePropertiesForm = async (req, isNew) => {
         sublabel: req.__("User role required to access page"),
         input_type: "select",
         options: roles.map((r) => ({ value: r.id, label: r.role })),
+        help: {
+          topic: "Role to access",
+          context: {},
+        },
       },
       ...(htmlOptions.length > 0
         ? [
@@ -525,6 +529,7 @@ router.post(
       } else {
         if (!pageRow.layout) pageRow.layout = {};
         if (!pageRow.fixed_states) pageRow.fixed_states = {};
+        pageRow.name = pageRow.name.trim();
         await Page.create(pageRow);
         await getState().refresh_pages();
         Trigger.emitEvent("AppChange", `Page ${pageRow.name}`, req.user, {

package/routes/scapi.js

@@ -32,6 +32,7 @@ const {
 } = require("@saltcorn/data/db/state");
 const db = require("@saltcorn/data/db");
 const { loadAllPlugins } = require("../load_plugins");
+const { text } = require("@saltcorn/markup/tags");
 
 /**
  * @type {object}
@@ -362,3 +363,38 @@ router.post(
     )(req, res, next);
   })
 );
+
+router.post(
+  "/run-view-route/:viewname/:route",
+  error_catcher(async (req, res, next) => {
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        const { viewname, route } = req.params;
+        const role = user?.id ? user.role_id : 100;
+        const state = getState();
+        state.log(
+          3,
+          `Route /view/${viewname} viewroute ${route} user=${req.user?.id}${
+            state.getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
+          }`
+        );
+
+        const view = View.findOne({ name: viewname });
+        if (!view) {
+          res
+            .status(404)
+            .json({ error: req.__(`No such view: %s`, text(viewname)) });
+          state.log(2, `View ${viewname} not found`);
+        } else if (role > view.min_role) {
+          res.status(401).json({ error: req.__("Not authorized") });
+          state.log(2, `View ${viewname} viewroute ${route} not authorized`);
+        } else {
+          req.user = user;
+          await view.runRoute(route, req.body || {}, res, { res, req });
+        }
+      }
+    )(req, res, next);
+  })
+);

package/routes/tables.js

@@ -269,7 +269,7 @@ router.get(
                   name: "name",
                   type: "String",
                   required: true,
-                  attributes: { autofocus: true },
+                  attributes: { autofocus: true, spellcheck: false },
                 },
                 ...(table_provider_names.length
                   ? [
@@ -416,10 +416,17 @@ router.get(
                   {
                     label: req.__("Table name"),
                     name: "name",
-                    input_type: "text",
+                    type: "String",
+                    required: true,
+                    attributes: { spellcheck: false },
                   },
                   // todo implement file mask filter like , accept: "text/csv"
-                  { label: req.__("File"), name: "file", input_type: "file" },
+                  {
+                    label: req.__("File"),
+                    name: "file",
+                    input_type: "file",
+                    attributes: { accept: ".csv" },
+                  },
                 ],
               }),
               req.csrfToken()
@@ -787,7 +794,7 @@ router.get(
     let id = parseInt(idorname);
     let table;
     if (id) [table] = await Table.find({ id });
-    
+
     if (!table) {
       [table] = await Table.find({ name: idorname });
     }
@@ -808,8 +815,12 @@ router.get(
     const user_can_edit_triggers =
       req.user.role_id === 1 ||
       getState().getConfig("min_role_edit_triggers", 1) >= req.user.role_id;
-
-    const nrows = await table.countRows({}, { forUser: req.user });
+    let nrows;
+    try {
+      nrows = await table.countRows({}, { forUser: req.user });
+    } catch {
+      nrows = NaN;
+    }
     const fields = table.getFields();
     const { child_relations } = await table.get_child_relations();
     const inbound_refs = [
@@ -825,7 +836,9 @@ router.get(
       fieldCard = [
         h4(req.__(`No fields defined in %s table`, table.name)),
         p(req.__("Fields define the columns in your table.")),
-        user_can_edit_tables &&
+        !table.external &&
+          !table.provider_name &&
+          user_can_edit_tables &&
           a(
             {
               href: `/field/new/${table.id}`,
@@ -1189,7 +1202,7 @@ router.get(
           title: req.__("Fields"),
           contents: fieldCard,
         },
-        ...(fields.length > 0
+        ...(fields.length > 0 || table.provider_name
           ? [
               {
                 type: "card",

package/routes/viewedit.js

@@ -185,6 +185,10 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         sublabel: req.__("Display data from this table"),
         options: tableOptions,
         disabled: isEdit,
+        help: {
+          topic: "View table",
+          context: {},
+        },
         showIf: isEdit
           ? hasTable.includes(values.viewtemplate)
             ? undefined
@@ -215,6 +219,10 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         input_type: "select",
         required: true,
         options: roles.map((r) => ({ value: r.id, label: r.role })),
+        help: {
+          topic: "Role to access",
+          context: {},
+        },
       }),
       new Field({
         label: req.__("Description"),
@@ -573,6 +581,7 @@ router.post(
           if (vt.initial_config) v.configuration = await vt.initial_config(v);
           else v.configuration = {};
           //console.log(v);
+          v.name = v.name.trim();
           await View.create(v);
         }
         await getState().refresh_views();