@saltcorn/server 1.1.2-beta.9 → 1.1.2

package/markup/admin.js

@@ -224,15 +224,25 @@ const send_infoarch_page = (args) => {
   const tenant_list =
     db.is_it_multi_tenant() &&
     db.getTenantSchema() === db.connectObj.default_schema;
-  const isUserAdmin = args.req?.user.role_id === 1;
+  const role = args.req?.user.role_id || 100;
+  const isUserAdmin = role === 1;
+  const state = getState();
+  const canEditMenu = state.getConfig("min_role_edit_menu", 1) >= role;
+  const canEditSearch = state.getConfig("min_role_edit_search", 1) >= role;
+  const canCreateSnapshot =
+    state.getConfig("min_role_create_snapshots", 1) >= role && role > 1;
+
   return send_settings_page({
     main_section: "Site structure",
     main_section_href: "/site-structure",
     sub_sections: [
-      { text: "Menu", href: "/menu" },
+      ...(canEditMenu ? [{ text: "Menu", href: "/menu" }] : []),
+      ...(canEditSearch ? [{ text: "Search", href: "/search/config" }] : []),
+      ...(canCreateSnapshot
+        ? [{ text: "Snapshots", href: "/site-structure/create-snapshot" }]
+        : []),
       ...(isUserAdmin
         ? [
-            { text: "Search", href: "/search/config" },
             { text: "Library", href: "/library/list" },
             { text: "Languages", href: "/site-structure/localizer" },
             ...(tenant_list
@@ -281,14 +291,22 @@ const send_users_page = (args) => {
  * @returns {void}
  */
 const send_files_page = (args) => {
+  const isUserAdmin = args.req?.user.role_id === 1;
   return send_settings_page({
     main_section: "Files",
     main_section_href: "/files",
-    sub_sections: [
-      { text: "Files", href: "/files" },
-      { text: "Storage", href: "/files/storage" },
-      { text: "Settings", href: "/files/settings" },
-    ],
+    no_nav_pills: !isUserAdmin,
+    sub_sections: isUserAdmin
+      ? [
+          { text: "Files", href: "/files" },
+          ...(isUserAdmin
+            ? [
+                { text: "Storage", href: "/files/storage" },
+                { text: "Settings", href: "/files/settings" },
+              ]
+            : []),
+        ]
+      : null,
     ...args,
   });
 };
@@ -482,8 +500,8 @@ const config_fields_form = async ({
         isView || isRole || isTenant
           ? "String"
           : configTypes[name].input_type
-          ? undefined
-          : configTypes[name].type,
+            ? undefined
+            : configTypes[name].type,
       input_type: configTypes[name].input_type,
       showIf,
       help: configTypes[name].helpTopic
@@ -492,10 +510,10 @@ const config_fields_form = async ({
       attributes: isView
         ? await viewAttributes(name)
         : isRole
-        ? roleAttribs
-        : isTenant
-        ? await getTenants()
-        : configTypes[name].attributes,
+          ? roleAttribs
+          : isTenant
+            ? await getTenants()
+            : configTypes[name].attributes,
     });
   }
   const form = new Form({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.2-beta.9",
+  "version": "1.1.2",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
     "@dr.pogodin/csurf": "^1.14.1",
-    "@saltcorn/base-plugin": "1.1.2-beta.9",
-    "@saltcorn/builder": "1.1.2-beta.9",
-    "@saltcorn/data": "1.1.2-beta.9",
-    "@saltcorn/admin-models": "1.1.2-beta.9",
-    "@saltcorn/filemanager": "1.1.2-beta.9",
-    "@saltcorn/markup": "1.1.2-beta.9",
-    "@saltcorn/plugins-loader": "1.1.2-beta.9",
-    "@saltcorn/sbadmin2": "1.1.2-beta.9",
+    "@saltcorn/base-plugin": "1.1.2",
+    "@saltcorn/builder": "1.1.2",
+    "@saltcorn/data": "1.1.2",
+    "@saltcorn/admin-models": "1.1.2",
+    "@saltcorn/filemanager": "1.1.2",
+    "@saltcorn/markup": "1.1.2",
+    "@saltcorn/plugins-loader": "1.1.2",
+    "@saltcorn/sbadmin2": "1.1.2",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/public/gridedit.js

@@ -164,13 +164,15 @@ function delete_tabulator_row(e, cell) {
     def?.formatterParams?.tableName || window.tabulator_table_name;
 
   const row = cell.getRow().getData();
-  if (!row.id) {
+
+  const pk_name = window.tabulator_table_primary_key || "id";
+  if (!row[pk_name]) {
     cell.getRow().delete();
     return;
   }
   $.ajax({
     type: "DELETE",
-    url: `/api/${tableName}/${row.id}`,
+    url: `/api/${tableName}/${row[pk_name]}`,
     data: row, // to process primary keys different from id
     headers: {
       "CSRF-Token": _sc_globalCsrf,

package/public/saltcorn-common.js

@@ -318,11 +318,11 @@ function apply_showif() {
         a.label === dynwhere.neutral_label
           ? -1
           : b.label === dynwhere.neutral_label
-          ? 1
-          : (a.label?.toLowerCase?.() || a.label) >
-            (b.label?.toLowerCase?.() || b.label)
-          ? 1
-          : -1
+            ? 1
+            : (a.label?.toLowerCase?.() || a.label) >
+                (b.label?.toLowerCase?.() || b.label)
+              ? 1
+              : -1
       );
       if (!dynwhere.required)
         toAppend.unshift({ label: dynwhere.neutral_label || "", value: "" });
@@ -1120,8 +1120,8 @@ function initialize_page() {
           type === "Integer" || type === "Float"
             ? "number"
             : type === "Bool"
-            ? "checkbox"
-            : "text"
+              ? "checkbox"
+              : "text"
         }" ${
           type === "Float"
             ? `step="${
@@ -1490,10 +1490,10 @@ function buildToast(txt, type, spin) {
     realtype === "success"
       ? "fa-check-circle"
       : realtype === "danger"
-      ? "fa-times-circle"
-      : realtype === "warning"
-      ? "fa-exclamation-triangle"
-      : "";
+        ? "fa-times-circle"
+        : realtype === "warning"
+          ? "fa-exclamation-triangle"
+          : "";
   const isNode = getIsNode();
   const rndid = `tab${Math.floor(Math.random() * 16777215).toString(16)}`;
   return {
@@ -1587,7 +1587,11 @@ function press_store_button(clicked, keepOld, disable) {
     $(btn).data("old-text", oldText);
   }
   const width = $(btn).width();
-  $(btn).html('<i class="fas fa-spinner fa-spin"></i>').width(width);
+  const height = $(btn).height();
+  $(btn)
+    .html('<i class="fas fa-spinner fa-spin"></i>')
+    .width(width)
+    .height(height);
   setTimeout(() => {
     $(btn).prop("disabled", true);
   }, 50);
@@ -1597,7 +1601,7 @@ function restore_old_button(btnId) {
   const btn = btnId instanceof jQuery ? btnId : $(`#${btnId}`);
   const oldText = $(btn).data("old-text");
   btn.html(oldText);
-  btn.css({ width: "" }).prop("disabled", false);
+  btn.css({ width: "", height: "" }).prop("disabled", false);
   btn.removeData("old-text");
 }
 
@@ -2174,6 +2178,34 @@ function restrict_options(selector, restriction) {
     });
 }
 
+function handle_identical_fields(event) {
+  let form = null;
+  if (event.currentTarget.tagName === "FORM") form = event.currentTarget;
+  else form = $(event.currentTarget).closest("form")[0];
+  if (!form) {
+    console.warn("No form found");
+  } else {
+    const name = event.target.name;
+    const newValue = event.target.value;
+    const tagName = event.target.tagName;
+    const isRadio = event.target.type === "radio";
+    if (tagName === "SELECT" || isRadio) {
+      form.querySelectorAll(`select[name="${name}"]`).forEach((select) => {
+        $(select).val(newValue); //.trigger("change");
+      });
+      form
+        .querySelectorAll(`input[type="radio"][name="${name}"]`)
+        .forEach((input) => {
+          input.checked = input.value === newValue;
+        });
+    } else if (tagName === "INPUT") {
+      form.querySelectorAll(`input[name="${name}"]`).forEach((input) => {
+        input.value = newValue;
+      });
+    }
+  }
+}
+
 const observer = new IntersectionObserver(
   (entries, observer) => {
     entries.forEach((entry) => {

package/public/saltcorn.js

@@ -186,8 +186,8 @@ function pjax_to(href, e) {
   let $dest = localizer.length
     ? localizer
     : inModal
-    ? $("#scmodal .modal-body")
-    : $("#page-inner-content");
+      ? $("#scmodal .modal-body")
+      : $("#page-inner-content");
   if (!$dest.length) window.location.href = href;
   else {
     loadPage = false;
@@ -693,7 +693,7 @@ function ajax_post(url, args) {
     },
     ...(args || {}),
   })
-    .done(ajax_done)
+    .done((res) => ajax_done(res))
     .fail((e, ...more) => {
       if (!checkNetworkError(e))
         return ajax_done(
@@ -1322,31 +1322,20 @@ function check_delete_unsaved(tablename, script_tag) {
   }
 }
 
-function handle_identical_fields(event) {
-  let form = null;
-  if (event.currentTarget.tagName === "FORM") form = event.currentTarget;
-  else form = $(event.currentTarget).closest("form")[0];
-  if (!form) {
-    console.warn("No form found");
-  } else {
-    const name = event.target.name;
-    const newValue = event.target.value;
-    const tagName = event.target.tagName;
-    const isRadio = event.target.type === "radio";
-    if (tagName === "SELECT" || isRadio) {
-      form.querySelectorAll(`select[name="${name}"]`).forEach((select) => {
-        $(select).val(newValue); //.trigger("change");
-      });
-      form
-        .querySelectorAll(`input[type="radio"][name="${name}"]`)
-        .forEach((input) => {
-          input.checked = input.value === newValue;
-        });
-    } else if (tagName === "INPUT") {
-      form.querySelectorAll(`input[name="${name}"]`).forEach((input) => {
-        input.value = newValue;
-      });
-    }
+function cfu_translate(that) {
+  const locale = that.value;
+  const translations = window.cfu_translations[locale];
+  if (translations) {
+    $("button[type=submit]").text(translations.submitLabel);
+    $("h1").text(translations.header);
+    $('form[action="/auth/create_first_user"]')
+      .parent()
+      .find("p")
+      .text(translations.blurb);
+    $("label[for=upload_to_restore] span").text(translations.restore);
+    $("label[for=inputdefault_language]").text(translations.language);
+    $("label[for=inputemail]").text(translations.email);
+    $("label[for=inputpassword]").text(translations.password);
   }
 }
 

package/routes/actions.js

@@ -15,10 +15,6 @@ const {
 const { ppVal, jsIdentifierValidator } = require("@saltcorn/data/utils");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
-const View = require("@saltcorn/data/models/view");
-const {
-  getForm,
-} = require("@saltcorn/data/base-plugin/viewtemplates/viewable_fields");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
 const { getTriggerList } = require("./common_lists");
 const TagEntry = require("@saltcorn/data/models/tag_entry");
@@ -29,6 +25,9 @@ const Tag = require("@saltcorn/data/models/tag");
 const db = require("@saltcorn/data/db");
 const MarkdownIt = require("markdown-it"),
   md = new MarkdownIt();
+const {
+  getWorkflowStepUserForm,
+} = require("@saltcorn/data/web-mobile-commons");
 
 /**
  * @type {object}
@@ -653,7 +652,7 @@ const getWorkflowStepForm = async (
               ...(field.showIf || {}),
             },
           };
-        if (cfgFld.input_type === "code") cfgFld.input_type = "textarea";
+        //if (cfgFld.input_type === "code") cfgFld.input_type = "textarea";
         actionConfigFields.push(cfgFld);
       }
     } catch {}
@@ -1690,42 +1689,6 @@ router.post(
   })
 );
 
-const getWorkflowStepUserForm = async (run, trigger, step, req) => {
-  if (step.action_name === "EditViewForm") {
-    const view = View.findOne({ name: step.configuration.edit_view });
-    const table = Table.findOne({ id: view.table_id });
-    const form = await getForm(
-      table,
-      view.name,
-      view.configuration.columns,
-      view.configuration.layout,
-      null,
-      req
-    );
-    await form.fill_fkey_options(false, undefined, req?.user);
-    form.action = `/actions/fill-workflow-form/${run.id}`;
-    if (run.context[step.configuration.response_variable])
-      Object.assign(
-        form.values,
-        run.context[step.configuration.response_variable]
-      );
-
-    return form;
-  }
-
-  let blurb = run.wait_info.output || step.configuration?.form_header || "";
-  if (run.wait_info.markdown && run.wait_info.output) blurb = md.render(blurb);
-  const form = new Form({
-    action: `/actions/fill-workflow-form/${run.id}`,
-    submitLabel: run.wait_info.output ? req.__("OK") : req.__("Submit"),
-    onSubmit: "press_store_button(this)",
-    blurb,
-    formStyle: run.wait_info.output || req.xhr ? "vert" : undefined,
-    fields: await run.userFormFields(step),
-  });
-  return form;
-};
-
 router.get(
   "/fill-workflow-form/:id",
   error_catcher(async (req, res) => {
@@ -1854,7 +1817,6 @@ interactive workflows for not logged in
 actions can declare which variables they inject into scope
 
 show unconnected steps
-why is code not initialising
 drag and drop edges
 
 */

package/routes/admin.js

@@ -117,6 +117,7 @@ const { get_help_markup } = require("../help/index.js");
 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 MarkdownIt = require("markdown-it"),
   md = new MarkdownIt();
 
@@ -236,6 +237,7 @@ admin_config_route({
               id: "testemail",
               href: "/admin/send-test-email",
               class: "btn btn-primary",
+              onclick: "spin_action_link(this)",
             },
             req.__("Send test email")
           ),
@@ -262,12 +264,14 @@ router.get(
       html: req.__("Hello from Saltcorn"),
     };
     try {
-      await getMailTransport().sendMail(email);
+      const sendres = await getMailTransport().sendMail(email);
+      getState().log(6, sendres);
       req.flash(
         "success",
         req.__("Email sent to %s with no errors", req.user.email)
       );
     } catch (e) {
+      console.error(e);
       req.flash("error", e.message);
     }
 
@@ -291,6 +295,22 @@ router.get(
   })
 );
 
+router.get(
+  "/jsdoc/*filepath",
+  isAdminOrHasConfigMinRole("min_role_edit_triggers"),
+  error_catcher(async (req, res) => {
+    const fullPath = File.normalise_in_base(
+      path.join(__dirname, "..", "docs"),
+      ...req.params.filepath
+    );
+    if (fs.existsSync(fullPath)) res.sendFile(fullPath);
+    else {
+      res.status(404);
+      res.sendWrap(`File not found`, { above: ["Help file not found"] });
+    }
+  })
+);
+
 router.get(
   "/whatsnew",
   isAdmin,
@@ -384,6 +404,7 @@ router.get(
                     req.csrfToken(),
                     {
                       btnClass: "btn-outline-primary",
+                      spinner: true,
                     }
                   )
                 ),
@@ -709,8 +730,8 @@ router.post(
       type === "trigger"
         ? `/actions`
         : /^[a-z]+$/g.test(type)
-        ? `/${type}edit`
-        : "/"
+          ? `/${type}edit`
+          : "/"
     );
   })
 );
@@ -837,7 +858,8 @@ const autoBackupForm = (req) => {
         label: req.__("Backup now"),
         id: "btnBackupNow",
         class: "btn btn-outline-secondary",
-        onclick: "ajax_post('/admin/auto-backup-now')",
+        onclick:
+          "ajax_post('/admin/auto-backup-now');press_store_button(this);",
       },
     ],
     fields: [
@@ -1195,7 +1217,7 @@ router.get(
                     th({ valign: "top" }, req.__("Saltcorn version")),
                     td(
                       packagejson.version,
-                      isRoot 
+                      isRoot && can_update
                         ? post_btn(
                             "/admin/upgrade",
                             req.__("Upgrade") + " (latest)",
@@ -1206,21 +1228,22 @@ router.get(
                             }
                           )
                         : isRoot && is_latest
-                        ? span(
-                            { class: "badge bg-primary ms-2" },
-                            req.__("Latest")
-                          ) +
-                          post_btn(
-                            "/admin/check-for-upgrade",
-                            req.__("Check updates"),
-                            req.csrfToken(),
-                            {
-                              btnClass: "btn-primary btn-sm px-1 py-0",
-                              formClass: "d-inline",
-                            }
-                          )
-                        : "",
-                      !git_commit &&
+                          ? span(
+                              { class: "badge bg-primary ms-2" },
+                              req.__("Latest")
+                            ) +
+                            post_btn(
+                              "/admin/check-for-upgrade",
+                              req.__("Check updates"),
+                              req.csrfToken(),
+                              {
+                                btnClass: "btn-primary btn-sm px-1 py-0",
+                                formClass: "d-inline",
+                              }
+                            )
+                          : "",
+                      isRoot &&
+                        !git_commit &&
                         a(
                           {
                             id: rndid,
@@ -1560,24 +1583,34 @@ const cleanNodeModules = async () => {
     throw new Error(
       `'${topSaltcornDir}' is not a Saltcorn installation directory`
     );
+  await PluginInstaller.cleanPluginsDirectory();
 };
 
 const doInstall = async (req, res, version, deepClean, runPull) => {
+  const state = getState();
+  let res_write = (s) => {
+    try {
+      res.write(s);
+      state.log(5, s);
+    } catch (e) {
+      console.error("Install write error: ", e?.message || e);
+    }
+  };
   if (db.getTenantSchema() !== db.connectObj.default_schema) {
     req.flash("error", req.__("Not possible for tenant"));
     res.redirect("/admin");
   } else {
-    res.write(
+    res_write(
       version === "latest"
         ? req.__("Starting upgrade, please wait...\n")
         : req.__("Installing %s, please wait...\n", version)
     );
     if (deepClean) {
-      res.write(req.__("Cleaning node_modules...\n"));
+      res_write(req.__("Cleaning node_modules...\n"));
       try {
         await cleanNodeModules();
       } catch (e) {
-        res.write(req.__("Error cleaning node_modules: %s\n", e.message));
+        res_write(req.__("Error cleaning node_modules: %s\n", e.message));
       }
     }
     const child = spawn(
@@ -1588,33 +1621,37 @@ const doInstall = async (req, res, version, deepClean, runPull) => {
       }
     );
     child.stdout.on("data", (data) => {
-      res.write(data);
+      res_write(data);
     });
     child.stderr?.on("data", (data) => {
-      res.write(data);
+      res_write(data);
     });
     child.on("exit", async function (code, signal) {
       if (code === 0) {
         if (deepClean) {
-          res.write(req.__("Installing sd-notify") + "\n");
+          res_write(req.__("Installing sd-notify") + "\n");
           const sdNotifyCode = await tryInstallSdNotify(req, res);
-          res.write(
+          res_write(
             req.__("sd-notify install done with code %s", sdNotifyCode) + "\n"
           );
         }
         if (runPull) {
-          res.write(
+          res_write(
             req.__("Pulling the capacitor-builder docker image...") + "\n"
           );
           const pullCode = await pullCapacitorBuilder(req, res, version);
-          res.write(req.__("Pull done with code %s", pullCode) + "\n");
+          res_write(req.__("Pull done with code %s", pullCode) + "\n");
           if (pullCode === 0) {
-            res.write(req.__("Pruning docker...") + "\n");
+            res_write(req.__("Pruning docker...") + "\n");
             const pruneCode = await pruneDocker(req, res);
-            res.write(req.__("Prune done with code %s", pruneCode) + "\n");
+            res_write(req.__("Prune done with code %s", pruneCode) + "\n");
           }
         }
       }
+      setTimeout(() => {
+        getState().processSend("RestartServer");
+        process.exit(0);
+      }, 200);
       res.end(
         version === "latest"
           ? req.__(
@@ -1624,10 +1661,6 @@ const doInstall = async (req, res, version, deepClean, runPull) => {
               `Install done with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
             )
       );
-      setTimeout(() => {
-        getState().processSend("RestartServer");
-        process.exit(0);
-      }, 100);
     });
   }
 };
@@ -1974,9 +2007,8 @@ router.get(
     const filename = `${moment(start).format("YYYYMMDDHHmm")}.html`;
     await File.new_folder("configuration_checks");
     const go = async () => {
-      const { passes, errors, pass, warnings } = await runConfigurationCheck(
-        req
-      );
+      const { passes, errors, pass, warnings } =
+        await runConfigurationCheck(req);
       const end = new Date();
       const secs = Math.round((end.getTime() - start.getTime()) / 1000);
 
@@ -3250,8 +3282,8 @@ router.get(
       mode === "prepare"
         ? "_prepare_step"
         : mode === "finish"
-        ? "_finish_step"
-        : "";
+          ? "_finish_step"
+          : "";
     res.json({
       finished: await checkFiles(out_dir_name, [
         `logs${stepDesc}.txt`,
@@ -3326,8 +3358,8 @@ router.get(
       mode === "prepare"
         ? "_prepare_step"
         : mode === "finish"
-        ? "_finish_step"
-        : "";
+          ? "_finish_step"
+          : "";
     const resultMsg = files.find(
       (file) => file.filename === `logs${stepDesc}.txt`
     )
@@ -3786,6 +3818,9 @@ router.post(
     }
     if (form.values.triggers) {
       await db.deleteWhere("_sc_tag_entries", { not: { trigger_id: null } });
+      await db.deleteWhere("_sc_workflow_trace");
+      await db.deleteWhere("_sc_workflow_runs");
+      await db.deleteWhere("_sc_workflow_steps");
       await db.deleteWhere("_sc_triggers");
       await getState().refresh_triggers();
     }
@@ -4052,7 +4087,7 @@ router.get(
             "Only functions declared as <code>function name(...) {...}</code> or <code>async function name(...) {...}</code> will be available in formulae and code actions. Declare a constant <code>k</code> as <code>globalThis.k = ...</code> In scope: " +
             a(
               {
-                href: "https://saltcorn.github.io/saltcorn/classes/_saltcorn_data.models.Table-1.html",
+                href: "/admin/jsdoc/classes/_saltcorn_data.models.Table-1.html",
                 target: "_blank",
               },
               "Table"