@saltcorn/server 1.1.0 → 1.1.1-beta.0

package/locales/en.json

@@ -1521,5 +1521,6 @@
 	"Step settings": "Step settings",
 	"Action settings": "Action settings",
 	"Workflow": "Workflow",
-	"Previous runs": "Previous runs"
+	"Previous runs": "Previous runs",
+	"The workflow the user will be interacting with.": "The workflow the user will be interacting with."
 }

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.0",
+  "version": "1.1.1-beta.0",
   "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",
-    "@saltcorn/builder": "1.1.0",
-    "@saltcorn/data": "1.1.0",
-    "@saltcorn/admin-models": "1.1.0",
-    "@saltcorn/filemanager": "1.1.0",
-    "@saltcorn/markup": "1.1.0",
-    "@saltcorn/plugins-loader": "1.1.0",
-    "@saltcorn/sbadmin2": "1.1.0",
+    "@saltcorn/base-plugin": "1.1.1-beta.0",
+    "@saltcorn/builder": "1.1.1-beta.0",
+    "@saltcorn/data": "1.1.1-beta.0",
+    "@saltcorn/admin-models": "1.1.1-beta.0",
+    "@saltcorn/filemanager": "1.1.1-beta.0",
+    "@saltcorn/markup": "1.1.1-beta.0",
+    "@saltcorn/plugins-loader": "1.1.1-beta.0",
+    "@saltcorn/sbadmin2": "1.1.1-beta.0",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn.css

@@ -469,6 +469,18 @@ div.unread-notify {
   color: inherit;
 }
 
+i.add-btw-nodes {
+  cursor: pointer;
+}
+
+pre.mermaid g.node[class*=" wfstep"] {
+  cursor: pointer;
+}
+
+pre.mermaid g.node[class*=" wfadd"] {
+  cursor: pointer;
+}
+
 .link-style {
   cursor: pointer;
   text-decoration: underline;
@@ -605,16 +617,18 @@ button.monospace-copy-btn {
   display: block;
 }
 
-i[class^="unicode-"], i[class*=" unicode-"] {
+i[class^="unicode-"],
+i[class*=" unicode-"] {
   font-style: normal;
 }
 
-.tabulator.table-dark:not(.thead-light) .tabulator-footer, .tabulator.table-dark:not(.thead-light) .tabulator-footer .tabulator-col {
+.tabulator.table-dark:not(.thead-light) .tabulator-footer,
+.tabulator.table-dark:not(.thead-light) .tabulator-footer .tabulator-col {
   background-color: #212529;
   border-color: #32383e;
   color: #fff;
 }
 
 .mobile-toast-margin {
-  margin-bottom: 1.0rem
-}
+  margin-bottom: 1rem;
+}

package/routes/actions.js

@@ -22,6 +22,8 @@ const WorkflowRun = require("@saltcorn/data/models/workflow_run");
 const WorkflowTrace = require("@saltcorn/data/models/workflow_trace");
 const Tag = require("@saltcorn/data/models/tag");
 const db = require("@saltcorn/data/db");
+const MarkdownIt = require("markdown-it"),
+  md = new MarkdownIt();
 
 /**
  * @type {object}
@@ -507,11 +509,29 @@ function genWorkflowDiagram(steps) {
         `  ${step.name} --> ${step.configuration.for_loop_step_name}`
       );
     } else if (stepNames.includes(step.next_step)) {
-      linkLines.push(`  ${step.name} --> ${step.next_step}`);
+      linkLines.push(
+        `  ${step.name}-- <i class="fas fa-plus add-btw-nodes btw-nodes-${step.id}-${step.next_step}"></i> ---${step.next_step}`
+      );
     } else if (step.next_step) {
+      let found = false;
       for (const otherStep of stepNames)
-        if (step.next_step.includes(otherStep))
+        if (step.next_step.includes(otherStep)) {
           linkLines.push(`  ${step.name} --> ${otherStep}`);
+          found = true;
+        }
+      if (!found) {
+        linkLines.push(
+          `  ${step.name}-- <a href="/actions/stepedit/${step.trigger_id}/${step.id}">Error: missing next step in ${step.name}</a> ---_End_${step.name}`
+        );
+        nodeLines.push(
+          `  _End_${step.name}:::wfadd${step.id}@{ shape: circle, label: "<i class='fas fa-plus with-link'></i>" }`
+        );
+      }
+    } else if (!step.next_step) {
+      linkLines.push(`  ${step.name} --> _End_${step.name}`);
+      nodeLines.push(
+        `  _End_${step.name}:::wfadd${step.id}@{ shape: circle, label: "<i class='fas fa-plus with-link'></i>" }`
+      );
     }
     if (step.action_name === "EndForLoop") {
       // TODO this is not correct. improve.
@@ -526,8 +546,16 @@ function genWorkflowDiagram(steps) {
     }
     step_ix += 1;
   }
+  if (!steps.length || !steps.find((s) => s.initial_step)) {
+    linkLines.push(`  _Start --> _End`);
+    nodeLines.push(
+      `  _End:::wfaddstart@{ shape: circle, label: "<i class='fas fa-plus with-link'></i>" }`
+    );
+  }
   const fc =
     "flowchart TD\n" + nodeLines.join("\n") + "\n" + linkLines.join("\n");
+  //console.log(fc);
+
   return fc;
 }
 
@@ -561,13 +589,31 @@ const getWorkflowConfig = async (req, id, table, trigger) => {
   const ns = $("g.node");
   if(!ns.length) setTimeout(tryAddWFNodes, 200)
   else {
+    $("i.add-btw-nodes").on("click", (e)=>{
+      const $e = $(e.target || e);
+      const cls = $e.attr('class');
+      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;
+    })
     $("g.node").on("click", (e)=>{
        const $e = $(e.target || e).closest("g.node")
        const cls = $e.attr('class')
-       if(!cls || !cls.includes("wfstep")) return;
+       if(!cls) return;      
+       //console.log(cls)
+       if(cls.includes("wfstep")) {
        const id = cls.split(" ").find(c=>c.startsWith("wfstep")).
           substr(6);
        location.href = '/actions/stepedit/${trigger.id}/'+id;
+       }
+       if(cls.includes("wfaddstart")) {
+         location.href = '/actions/stepedit/${trigger.id}?initial_step=true';
+       } else if(cls.includes("wfadd")) {
+         const id = cls.split(" ").find(c=>c.startsWith("wfadd")).
+          substr(5);
+         location.href = '/actions/stepedit/${trigger.id}?after_step='+id;
+       }
       //console.log($e.attr('class'), id)
      })
   }
@@ -579,7 +625,7 @@ window.addEventListener('DOMContentLoaded',tryAddWFNodes)`
         href: `/actions/stepedit/${trigger.id}${
           initial_step ? "" : "?initial_step=true"
         }`,
-        class: "btn btn-primary",
+        class: "btn btn-secondary",
       },
       i({ class: "fas fa-plus me-2" }),
       "Add step"
@@ -605,7 +651,13 @@ const jsIdentifierValidator = (s) => {
   if (badc) return `Character ${badc} not allowed`;
 };
 
-const getWorkflowStepForm = async (trigger, req, step_id) => {
+const getWorkflowStepForm = async (
+  trigger,
+  req,
+  step_id,
+  after_step,
+  before_step
+) => {
   const table = trigger.table_id ? Table.findOne(trigger.table_id) : null;
   const actionExplainers = {};
 
@@ -626,13 +678,23 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
       });
 
       for (const field of cfgFields) {
-        const cfgFld = {
-          ...field,
-          showIf: {
-            wf_action_name: name,
-            ...(field.showIf || {}),
-          },
-        };
+        let cfgFld;
+        if (field.isRepeat)
+          cfgFld = new FieldRepeat({
+            ...field,
+            showIf: {
+              wf_action_name: name,
+              ...(field.showIf || {}),
+            },
+          });
+        else
+          cfgFld = {
+            ...field,
+            showIf: {
+              wf_action_name: name,
+              ...(field.showIf || {}),
+            },
+          };
         if (cfgFld.input_type === "code") cfgFld.input_type = "textarea";
         actionConfigFields.push(cfgFld);
       }
@@ -646,6 +708,7 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
       "SetContext",
       "TableQuery",
       "Output",
+      "DataOutput",
       "WaitUntil",
       "WaitNextTick",
       "UserForm",
@@ -662,6 +725,8 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
   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.DataOutput =
+    "Display a value to the user. Arrays of objects will be displayed as tables. 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)";
@@ -710,6 +775,23 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
     fieldview: "textarea",
     showIf: { wf_action_name: "Output" },
   });
+  actionConfigFields.push({
+    label: "Output expression",
+    name: "output_expr",
+    sublabel:
+      "JavaScript expression for the value to output. Typically the name of a variable",
+    type: "String",
+    class: "validate-expression",
+    showIf: { wf_action_name: "DataOutput" },
+  });
+  actionConfigFields.push({
+    label: "Markdown",
+    name: "markdown",
+    sublabel:
+      "The centents are markdown formatted and should be rendered to HTML",
+    type: "Bool",
+    showIf: { wf_action_name: "Output" },
+  });
   actionConfigFields.push({
     label: "Table",
     name: "query_table",
@@ -788,8 +870,8 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
 
   const form = new Form({
     action: addOnDoneRedirect(`/actions/stepedit/${trigger.id}`, req),
-    onChange: "saveAndContinueIfValid(this)",
-    submitLabel: req.__("Done"),
+    onChange: step_id ? "saveAndContinueIfValid(this)" : undefined,
+    submitLabel: step_id ? req.__("Done") : undefined,
     additionalButtons: step_id
       ? [
           {
@@ -856,6 +938,9 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
     ],
   });
   form.hidden("wf_step_id");
+  form.hidden("_after_step");
+  if (before_step) form.values.wf_next_step = before_step;
+  if (after_step) form.values._after_step = after_step;
   if (step_id) {
     const step = await WorkflowStep.findOne({ id: step_id });
     if (!step) throw new Error("Step not found");
@@ -1366,9 +1451,15 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { trigger_id, step_id } = req.params;
-    const { initial_step, name } = req.query;
+    const { initial_step, after_step, before_step } = req.query;
     const trigger = await Trigger.findOne({ id: trigger_id });
-    const form = await getWorkflowStepForm(trigger, req, step_id);
+    const form = await getWorkflowStepForm(
+      trigger,
+      req,
+      step_id,
+      after_step,
+      before_step
+    );
 
     if (initial_step) form.values.wf_initial_step = true;
     if (!step_id) {
@@ -1434,6 +1525,7 @@ router.post(
       wf_initial_step,
       wf_only_if,
       wf_step_id,
+      _after_step,
       ...configuration
     } = form.values;
     Object.entries(configuration).forEach(([k, v]) => {
@@ -1469,6 +1561,13 @@ router.post(
           res.redirect(`/actions/configure/${step.trigger_id}`);
         }
       }
+      if (_after_step) {
+        const astep = await WorkflowStep.findOne({
+          id: _after_step,
+          trigger_id,
+        });
+        if (astep) await astep.update({ next_step: step.name });
+      }
     } catch (e) {
       const emsg =
         e.message ===
@@ -1514,6 +1613,10 @@ router.get(
       [
         { label: "Trigger", key: (run) => trNames[run.trigger_id] },
         { label: "Started", key: (run) => localeDateTime(run.started_at) },
+        {
+          label: "Updated",
+          key: (run) => localeDateTime(run.status_updated_at),
+        },
         { label: "Status", key: "status" },
         {
           label: "",
@@ -1698,10 +1801,12 @@ router.post(
 );
 
 const getWorkflowStepUserForm = async (run, trigger, step, req) => {
+  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"),
-    blurb: run.wait_info.output || step.configuration?.form_header || "",
+    blurb,
     formStyle: run.wait_info.output || req.xhr ? "vert" : undefined,
     fields: await run.userFormFields(step),
   });