@saltcorn/server 1.1.0-beta.23 → 1.1.0-beta.25

package/load_plugins.js

@@ -8,7 +8,7 @@
 const db = require("@saltcorn/data/db");
 const { getState, getRootState } = require("@saltcorn/data/db/state");
 const Plugin = require("@saltcorn/data/models/plugin");
-const { isRoot } = require("@saltcorn/data/utils");
+const { isRoot, getFetchProxyOptions } = require("@saltcorn/data/utils");
 const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
 
 const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer");
@@ -35,7 +35,8 @@ const getEngineInfos = async (plugin, forceFetch) => {
   } else {
     getState().log(5, `Fetching versions for '${plugin.location}'`);
     const pkgInfo = await npmFetch.json(
-      `https://registry.npmjs.org/${plugin.location}`
+      `https://registry.npmjs.org/${plugin.location}`,
+      getFetchProxyOptions()
     );
     const versions = pkgInfo.versions;
     const newCached = {};

package/locales/en.json

@@ -1514,5 +1514,9 @@
 	"Please enter a version in the format 'x.y.z' (e.g. 0.0.1 with numbers from 0 to 999) or leave it empty.": "Please enter a version in the format 'x.y.z' (e.g. 0.0.1 with numbers from 0 to 999) or leave it empty.",
 	"Delete unchanged": "Delete unchanged",
 	"Delete allocated row if there are no changes.": "Delete allocated row if there are no changes.",
-	"Triggers on table": "Triggers on table"
+	"Triggers on table": "Triggers on table",
+	"Submit": "Submit",
+	"OK": "OK",
+	"Step settings": "Step settings",
+	"Action settings": "Action settings"
 }

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.0-beta.23",
+  "version": "1.1.0-beta.25",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "1.1.0-beta.23",
-    "@saltcorn/builder": "1.1.0-beta.23",
-    "@saltcorn/data": "1.1.0-beta.23",
-    "@saltcorn/admin-models": "1.1.0-beta.23",
-    "@saltcorn/filemanager": "1.1.0-beta.23",
-    "@saltcorn/markup": "1.1.0-beta.23",
-    "@saltcorn/plugins-loader": "1.1.0-beta.23",
-    "@saltcorn/sbadmin2": "1.1.0-beta.23",
+    "@saltcorn/base-plugin": "1.1.0-beta.25",
+    "@saltcorn/builder": "1.1.0-beta.25",
+    "@saltcorn/data": "1.1.0-beta.25",
+    "@saltcorn/admin-models": "1.1.0-beta.25",
+    "@saltcorn/filemanager": "1.1.0-beta.25",
+    "@saltcorn/markup": "1.1.0-beta.25",
+    "@saltcorn/plugins-loader": "1.1.0-beta.25",
+    "@saltcorn/sbadmin2": "1.1.0-beta.25",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn.js

@@ -1213,14 +1213,16 @@ function check_delete_unsaved(tablename, script_tag) {
   if (form.length && !form.attr("data-form-changed")) {
     //delete row
     const rec = get_form_record(form);
-    
-    $.ajax({
-      url: `/api/${tablename}/${rec.id}`,
-      type: "DELETE",
-      headers: {
-        "CSRF-Token": _sc_globalCsrf,
-      },
-    });
+    if (navigator.sendBeacon) {
+      navigator.sendBeacon(`/api/${tablename}/delete/${rec.id}`);
+    } else
+      $.ajax({
+        url: `/api/${tablename}/${rec.id}`,
+        type: "DELETE",
+        headers: {
+          "CSRF-Token": _sc_globalCsrf,
+        },
+      });
   }
 }
 

package/routes/actions.js

@@ -554,18 +554,6 @@ const getWorkflowConfig = async (req, id, table, trigger) => {
   });
   trigCfgForm.values = trigger.configuration;
   return (
-    /*ul(
-      steps.map((step) =>
-        li(
-          a(
-            {
-              href: `/actions/stepedit/${trigger.id}/${step.id}`,
-            },
-            step.name
-          )
-        )
-      )
-    ) +*/
     pre({ class: "mermaid" }, genWorkflowDiagram(steps)) +
     script(
       { defer: "defer" },
@@ -588,8 +576,8 @@ window.addEventListener('DOMContentLoaded',tryAddWFNodes)`
     ) +
     a(
       {
-        href: `/actions/stepedit/${trigger.id}?name=step${steps.length + 1}${
-          initial_step ? "" : "&initial_step=true"
+        href: `/actions/stepedit/${trigger.id}${
+          initial_step ? "" : "?initial_step=true"
         }`,
         class: "btn btn-primary",
       },
@@ -619,6 +607,8 @@ const jsIdentifierValidator = (s) => {
 
 const getWorkflowStepForm = async (trigger, req, step_id) => {
   const table = trigger.table_id ? Table.findOne(trigger.table_id) : null;
+  const actionExplainers = {};
+
   let stateActions = getState().actions;
   const stateActionKeys = Object.entries(stateActions)
     .filter(([k, v]) => !v.disableInWorkflow)
@@ -627,6 +617,9 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
   const actionConfigFields = [];
   for (const [name, action] of Object.entries(stateActions)) {
     if (!stateActionKeys.includes(name)) continue;
+
+    if (action.description) actionExplainers[name] = action.description;
+
     try {
       const cfgFields = await getActionConfigFields(action, table, {
         mode: "workflow",
@@ -654,14 +647,30 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
       "TableQuery",
       "Output",
       "WaitUntil",
-      "UserForm",
       "WaitNextTick",
+      "UserForm",
     ],
     forWorkflow: true,
   });
+  const triggers = Trigger.find({
+    when_trigger: { or: ["API call", "Never"] },
+  });
+  triggers.forEach((tr) => {
+    if (tr.description) actionExplainers[tr.name] = tr.description;
+  });
+  actionExplainers.SetContext = "Set variables in the context";
+  actionExplainers.TableQuery = "Query a table into a variable in the context";
+  actionExplainers.Output =
+    "Display a message to the user. Pause workflow until the message is read.";
+  actionExplainers.WaitUntil = "Pause until a time in the future";
+  actionExplainers.WaitNextTick =
+    "Pause until the next scheduler invocation (at most 5 minutes)";
+  actionExplainers.UserForm =
+    "Ask a user one or more questions, pause until they are answered";
 
   actionConfigFields.push({
     label: "Form header",
+    sublabel: "Text shown to the user at the top of the form",
     name: "form_header",
     type: "String",
     showIf: { wf_action_name: "UserForm" },
@@ -792,6 +801,10 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
         ]
       : undefined,
     fields: [
+      {
+        input_type: "section_header",
+        label: req.__("Step settings"),
+      },
       {
         name: "wf_step_name",
         label: req.__("Step name"),
@@ -821,6 +834,10 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
         sublabel:
           "Name of next step. Can be a JavaScript expression based on the run context. Blank if final step",
       },
+      {
+        input_type: "section_header",
+        label: req.__("Action"),
+      },
       {
         name: "wf_action_name",
         label: req.__("Action"),
@@ -828,8 +845,13 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
         required: true,
         attributes: {
           options: actionsNotRequiringRow,
+          explainers: actionExplainers,
         },
       },
+      {
+        input_type: "section_header",
+        label: req.__("Action settings"),
+      },
       ...actionConfigFields,
     ],
   });
@@ -1349,7 +1371,13 @@ router.get(
     const form = await getWorkflowStepForm(trigger, req, step_id);
 
     if (initial_step) form.values.wf_initial_step = true;
-    if (name) form.values.wf_step_name = name;
+    if (!step_id) {
+      const steps = await WorkflowStep.find({ trigger_id });
+      const stepNames = new Set(steps.map((s) => s.name));
+      let name_ix = steps.length + 1;
+      while (stepNames.has(`step${name_ix}`)) name_ix += 1;
+      form.values.wf_step_name = `step${name_ix}`;
+    }
     send_events_page({
       res,
       req,
@@ -1699,6 +1727,7 @@ const getWorkflowStepUserForm = async (run, trigger, step, req) => {
 
   const form = new Form({
     action: `/actions/fill-workflow-form/${run.id}`,
+    submitLabel: run.wait_info.output ? req.__("OK") : req.__("Submit"),
     blurb: run.wait_info.output || step.configuration?.form_header || "",
     formStyle: run.wait_info.output || req.xhr ? "vert" : undefined,
     fields: (step.configuration.user_form_questions || []).map((q) => ({
@@ -1767,12 +1796,15 @@ router.post(
       res.sendWrap(title, renderForm(form, req.csrfToken()));
     } else {
       await run.provide_form_input(form.values);
-      await run.run({
+      const runres = await run.run({
         user: req.user,
         trace: trigger.configuration?.save_traces,
+        interactive: true,
       });
       if (req.xhr) {
         const retDirs = await run.popReturnDirectives();
+
+        if (runres?.popup) retDirs.popup = runres.popup;
         res.json({ success: "ok", ...retDirs });
       } else {
         if (run.context.goto) res.redirect(run.context.goto);
@@ -1825,16 +1857,12 @@ router.post(
 
 WORKFLOWS TODO
 
-delete is not always working?
 help file to explain steps, and context
 
-Output after form not popping up
-action explainer 
 workflow actions: ForLoop, EndForLoop, ReadFile, WriteFile, APIResponse
 
-correctly suggest new step name - on step cfg load
-
 Error handlers
+other triggers can be steps
 interactive workflows for not logged in
 show end node in diagram
 actions can declare which variables they inject into scope

package/routes/admin.js

@@ -104,7 +104,10 @@ const PageGroup = require("@saltcorn/data/models/page_group");
 const { getConfigFile } = require("@saltcorn/data/db/connect");
 const os = require("os");
 const Page = require("@saltcorn/data/models/page");
-const { getSafeSaltcornCmd } = require("@saltcorn/data/utils");
+const {
+  getSafeSaltcornCmd,
+  getFetchProxyOptions,
+} = require("@saltcorn/data/utils");
 const stream = require("stream");
 const Crash = require("@saltcorn/data/models/crash");
 const { get_help_markup } = require("../help/index.js");
@@ -1334,7 +1337,8 @@ router.get(
   error_catcher(async (req, res) => {
     try {
       const pkgInfo = await npmFetch.json(
-        "https://registry.npmjs.org/@saltcorn/cli"
+        "https://registry.npmjs.org/@saltcorn/cli",
+        getFetchProxyOptions()
       );
       if (!pkgInfo?.versions)
         throw new Error(req.__("Unable to fetch versions"));

package/routes/api.js

@@ -484,6 +484,57 @@ router.post(
   })
 );
 
+/**
+ * Delete Table row by ID using POST
+ * @name delete/:tableName/:id
+ * @function
+ * @memberof module:routes/api~apiRouter
+ */
+router.post(
+  "/:tableName/delete/:id",
+  // in case of primary key different from id - id will be string "undefined"
+  error_catcher(async (req, res, next) => {
+    const { tableName, id } = req.params;
+    const table = Table.findOne({ name: tableName });
+    if (!table) {
+      getState().log(3, `API DELETE ${tableName} not found`);
+      res.status(404).json({ error: req.__("Not found") });
+      return;
+    }
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedWrite(req, user, table)) {
+          try {
+            if (id === "undefined") {
+              const pk_name = table.pk_name;
+              //const fields = table.getFields();
+              const row = req.body;
+              //readState(row, fields);
+              await table.deleteRows(
+                { [pk_name]: row[pk_name] },
+                user || req.user || { role_id: 100 }
+              );
+            } else
+              await table.deleteRows(
+                { id },
+                user || req.user || { role_id: 100 }
+              );
+            res.json({ success: true });
+          } catch (e) {
+            getState().log(2, `API DELETE ${table.name} error: ${e.message}`);
+            res.status(400).json({ error: e.message });
+          }
+        } else {
+          getState().log(3, `API DELETE ${table.name} not authorized`);
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
+);
+
 /**
  * Update Table row directed by ID using POST
  * POST api/<table>/id

package/routes/plugins.js

@@ -57,7 +57,11 @@ const fs = require("fs");
 const path = require("path");
 const { get_latest_npm_version } = require("@saltcorn/data/models/config");
 const { flash_restart } = require("../markup/admin.js");
-const { sleep, removeNonWordChars } = require("@saltcorn/data/utils");
+const {
+  sleep,
+  removeNonWordChars,
+  getFetchProxyOptions,
+} = require("@saltcorn/data/utils");
 const { loadAllPlugins } = require("../load_plugins");
 const npmFetch = require("npm-registry-fetch");
 const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer");
@@ -609,7 +613,8 @@ router.get(
     } else {
       try {
         const pkgInfo = await npmFetch.json(
-          `https://registry.npmjs.org/${plugin.location}`
+          `https://registry.npmjs.org/${plugin.location}`,
+          getFetchProxyOptions()
         );
         if (!pkgInfo?.versions)
           throw new Error(req.__("Unable to fetch versions"));