@saltcorn/server 1.1.3-beta.1 → 1.1.3-beta.10

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");
@@ -1485,7 +1504,7 @@ function getIsNode() {
   }
 }
 
-function buildToast(txt, type, spin) {
+function buildToast(txt, type, spin, title) {
   const realtype = type === "error" ? "danger" : type;
   const icon =
     realtype === "success"
@@ -1514,7 +1533,7 @@ function buildToast(txt, type, spin) {
       <div class="toast-header bg-${realtype} text-white py-1 ">
         <i class="fas ${icon} me-2"></i>
         <strong class="me-auto" >
-          ${type}
+          ${title || type}
         </strong>
         ${
           spin
@@ -1564,7 +1583,7 @@ function notifyAlert(note, spin) {
     txt = JSON.stringify(note, null, 2);
   }
 
-  const { id, html } = buildToast(txt, type, spin);
+  const { id, html } = buildToast(txt, type, spin, note.toast_title);
   let $modal = $("#scmodal");
   if ($modal.length && $modal.hasClass("show"))
     $("#modal-toasts-area").append(html);
@@ -1639,16 +1658,19 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
       if (evalres) await common_done(evalres, viewnameOrElem, isWeb);
     }
   };
-  if (res.notify) await handle(res.notify, notifyAlert);
+  if (res.notify)
+    await handle(res.notify, (text) =>
+      notifyAlert({ type: "info", text, toast_title: res.toast_title })
+    );
   if (res.error) {
     if (window._sc_loglevel > 4) console.trace("error response", res.error);
     await handle(res.error, (text) =>
-      notifyAlert({ type: "danger", text: text })
+      notifyAlert({ type: "danger", text, toast_title: res.toast_title })
     );
   }
   if (res.notify_success)
     await handle(res.notify_success, (text) =>
-      notifyAlert({ type: "success", text: text })
+      notifyAlert({ type: "success", text, toast_title: res.toast_title })
     );
   if (res.set_fields && (viewname || res.set_fields._viewname)) {
     const form =

package/public/saltcorn.js

@@ -76,7 +76,7 @@ function removeQueryStringParameter(uri1, key, value) {
   let re;
   if (value) {
     re = new RegExp(
-      "([?&])" + escapeRegExp(key) + "=" + value + "?(&|$)",
+      "([?&])" + escapeRegExp(key) + "=" + encodeURIComponent(value) + "?(&|$)",
       "gi"
     );
   } else {
@@ -131,11 +131,13 @@ function set_state_field(key, value, e) {
 function check_state_field(that, e) {
   const checked = that.checked;
   const name = that.name;
-  const value = encodeURIComponent(that.value);
+  const value = that.value;
   let dest;
   if (checked)
     dest = addQueryStringParameter(get_current_state_url(e), name, value);
   else dest = removeQueryStringParameter(get_current_state_url(e), name, value);
+  console.log({ dest, name, value, tvalue: that.value });
+
   pjax_to(dest.replace("&&", "&").replace("?&", "?"), e);
 }
 
@@ -922,7 +924,7 @@ function poll_mobile_build_finished(
     data: { out_dir_name: outDirName, mode: mode },
     success: function (res) {
       if (!res.finished) {
-        if (pollCount >= 100) {
+        if (pollCount >= 150) {
           removeSpinner("buildMobileAppBtnId", orginalBtnHtml);
           notifyAlert({
             type: "danger",

package/routes/actions.js

@@ -562,7 +562,10 @@ const getWorkflowConfig = async (req, id, table, trigger) => {
       const idnext = cls.split(" ").find(c=>c.startsWith("btw-nodes-")).
           substr(10);
       const [idprev, nmnext] = idnext.split("-");
-      location.href = '/actions/stepedit/${trigger.id}?after_step='+idprev+'&before_step='+nmnext;
+      if(cls.includes("init-for-body"))
+        location.href = '/actions/stepedit/${trigger.id}?after_step_for='+idprev+'&before_step='+nmnext;
+      else
+        location.href = '/actions/stepedit/${trigger.id}?after_step='+idprev+'&before_step='+nmnext;
     })
     $("g.node").on("click", (e)=>{
        const $e = $(e.target || e).closest("g.node")
@@ -613,7 +616,8 @@ const getWorkflowStepForm = async (
   req,
   step_id,
   after_step,
-  before_step
+  before_step,
+  after_step_for
 ) => {
   const table = trigger.table_id ? Table.findOne(trigger.table_id) : null;
   const actionExplainers = {};
@@ -656,7 +660,9 @@ const getWorkflowStepForm = async (
         //if (cfgFld.input_type === "code") cfgFld.input_type = "textarea";
         actionConfigFields.push(cfgFld);
       }
-    } catch {}
+    } catch {
+      //ignore
+    }
   }
   actionConfigFields.push({
     label: "Subcontext",
@@ -779,9 +785,11 @@ const getWorkflowStepForm = async (
   });
   form.hidden("wf_step_id");
   form.hidden("_after_step");
+  form.hidden("_after_step_for");
   if (before_step) form.values.wf_next_step = before_step;
   if (after_step == "0") form.values.wf_initial_step = true;
   else if (after_step) form.values._after_step = after_step;
+  else if (after_step_for) form.values._after_step_for = after_step_for;
   if (step_id) {
     const step = await WorkflowStep.findOne({ id: step_id });
     if (!step) throw new Error("Step not found");
@@ -1312,14 +1320,15 @@ router.get(
   isAdminOrHasConfigMinRole("min_role_edit_triggers"),
   error_catcher(async (req, res) => {
     const { trigger_id, step_id } = req.params;
-    const { initial_step, after_step, before_step } = req.query;
+    const { initial_step, after_step, before_step, after_step_for } = req.query;
     const trigger = await Trigger.findOne({ id: trigger_id });
     const form = await getWorkflowStepForm(
       trigger,
       req,
       step_id,
       after_step,
-      before_step
+      before_step,
+      after_step_for
     );
 
     if (initial_step) form.values.wf_initial_step = true;
@@ -1387,6 +1396,7 @@ router.post(
       wf_only_if,
       wf_step_id,
       _after_step,
+      _after_step_for,
       ...configuration
     } = form.values;
     Object.entries(configuration).forEach(([k, v]) => {
@@ -1433,7 +1443,21 @@ router.post(
         });
         if (astep) await astep.update({ next_step: step.name });
       }
+      if (_after_step_for && _after_step_for !== "undefined") {
+        const astep = await WorkflowStep.findOne({
+          id: _after_step_for,
+          trigger_id,
+        });
+        if (astep)
+          await astep.update({
+            configuration: {
+              ...step.configuration,
+              loop_body_initial_step: step.name,
+            },
+          });
+      }
     } catch (e) {
+      console.error(e);
       const emsg =
         e.message ===
         'duplicate key value violates unique constraint "workflow_steps_name_uniq"'
@@ -1502,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) => {
@@ -1713,11 +1737,17 @@ router.get(
       trigger_id: trigger.id,
       name: run.current_step_name,
     });
-
-    const form = await getWorkflowStepUserForm(run, trigger, step, req);
-    if (req.xhr) form.xhrSubmit = true;
-    const title = run.wait_info.output ? "Workflow output" : "Fill form";
-    res.sendWrap(title, renderForm(form, req.csrfToken()));
+    try {
+      const form = await getWorkflowStepUserForm(run, trigger, step, req);
+      if (req.xhr) form.xhrSubmit = true;
+      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");
       }
@@ -2152,7 +2163,10 @@ const buildDialogScript = (capacitorBuilderAvailable, isSbadmin2) =>
 
 const imageAvailable = async () => {
   try {
-    const image = new Docker().getImage("saltcorn/capacitor-builder");
+    const state = getState();
+    const image = new Docker().getImage(
+      `saltcorn/capacitor-builder:${state.scVersion}`
+    );
     await image.inspect();
     return true;
   } catch (e) {
@@ -4095,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",
@@ -4120,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(
@@ -4140,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(
@@ -4202,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,
+        ],
       },
     });
   })
@@ -4220,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/list.js

@@ -190,7 +190,7 @@ const typeToGridType = (t, field) => {
   if (field.calculated) {
     jsgField.editor = false;
   }
-  if (field.primary_key) {
+  if (field.primary_key && !field?.attributes?.NonSerial) {
     jsgField.editor = false;
   }
   return jsgField;
@@ -221,8 +221,8 @@ jsGrid.fields.versions = VersionsField;
 // end of versionsField
 
 const arrangeIdFirst = (flds) => {
-  const noId = flds.filter((f) => f.name !== "id");
-  const id = flds.find((f) => f.name === "id");
+  const noId = flds.filter((f) => !f.primary_key);
+  const id = flds.find((f) => f.primary_key);
   if (id) return [id, ...noId];
   else return flds;
 };
@@ -282,7 +282,7 @@ router.get(
       cellClick: "__delete_tabulator_row",
     });
     const isDark = getState().getLightDarkMode(req.user) === "dark";
-    const pkNm = table.pk_name
+    const pkNm = table.pk_name;
     res.sendWrap(
       {
         title: req.__(`%s data table`, table.name),
@@ -407,8 +407,8 @@ router.get(
                   ajaxURL:"/api/${encodeURIComponent(
                     table.name
                   )}?tabulator_pagination_format=true${
-                  table.versioned ? "&versioncount=on" : ""
-                }",                   
+                    table.versioned ? "&versioncount=on" : ""
+                  }",                   
                   layout:"fitColumns", 
                   columns,
                   height:"100%",
@@ -427,10 +427,14 @@ router.get(
               });
               window.tabulator_table.on("cellEdited", function(cell){
                 const row = cell.getRow().getData()
+                const fieldName = cell.getColumn().getField()
+                let ident = (row.${pkNm}||"");
+                if(fieldName === "${pkNm}")
+                  ident = "";
                 ajax_indicator(true);
                 $.ajax({
                   type: "POST",
-                  url: "/api/${table.name}/" + (row.${pkNm}||""),
+                  url: "/api/${table.name}/" + ident,
                   data: row,
                   headers: {
                     "CSRF-Token": _sc_globalCsrf,

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