@saltcorn/server 1.1.0-beta.14 → 1.1.0-beta.15

package/public/saltcorn.js

@@ -1208,6 +1208,21 @@ function check_unsaved_form(event, script_tag) {
     event.returnValue = true;
   }
 }
+function check_delete_unsaved(tablename, script_tag) {
+  const form = $(script_tag).parent().find("form");
+  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,
+      },
+    });
+  }
+}
 
 (() => {
   const e = document.querySelector("[data-sidebar-toggler]");

package/routes/actions.js

@@ -344,6 +344,11 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await triggerForm(req);
+    if (req.query.table) {
+      const table = Table.findOne({ name: req.query.table });
+      if (table) form.values.table_id = table.id;
+    }
+
     send_events_page({
       res,
       req,
@@ -487,15 +492,16 @@ router.post(
 
 function genWorkflowDiagram(steps) {
   const stepNames = steps.map((s) => s.name);
-  const nodeLines = steps
-    .map(
-      (s) => `  ${s.name}["\`**${s.name}**
+  const nodeLines = steps.map(
+    (s) => `  ${s.name}["\`**${s.name}**
   ${s.action_name}\`"]:::wfstep${s.id}`
-    )
-    .join("\n");
+  );
+
+  nodeLines.unshift(`  _Start@{ shape: circle, label: "Start" }`);
   const linkLines = [];
   let step_ix = 0;
   for (const step of steps) {
+    if (step.initial_step) linkLines.push(`  _Start --> ${step.name}`);
     if (step.action_name === "ForLoop") {
       linkLines.push(
         `  ${step.name} --> ${step.configuration.for_loop_step_name}`
@@ -520,7 +526,9 @@ function genWorkflowDiagram(steps) {
     }
     step_ix += 1;
   }
-  return "flowchart TD\n" + nodeLines + "\n" + linkLines.join("\n");
+  const fc =
+    "flowchart TD\n" + nodeLines.join("\n") + "\n" + linkLines.join("\n");
+  return fc;
 }
 
 const getWorkflowConfig = async (req, id, table, trigger) => {
@@ -644,6 +652,7 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
     builtIns: [
       "SetContext",
       "TableQuery",
+      "Output",
       "WaitUntil",
       "UserForm",
       "WaitNextTick",
@@ -683,7 +692,15 @@ const getWorkflowStepForm = async (trigger, req, step_id) => {
     default: "{}",
     showIf: { wf_action_name: "SetContext" },
   });
-
+  actionConfigFields.push({
+    label: "Output text",
+    name: "output_text",
+    sublabel:
+      "Message shown to the user. Can contain HTML tags and use interpolations {{ }} to access the context",
+    type: "String",
+    fieldview: "textarea",
+    showIf: { wf_action_name: "Output" },
+  });
   actionConfigFields.push({
     label: "Table",
     name: "query_table",
@@ -959,7 +976,9 @@ router.get(
           },
           {
             headerTag: `<script type="module">mermaid.initialize({securityLevel: 'loose'${
-              getState().getLightDarkMode(req.user) ? ",theme: 'dark'," : ""
+              getState().getLightDarkMode(req.user) === "dark"
+                ? ",theme: 'dark',"
+                : ""
             }});</script>`,
           },
         ],
@@ -1401,22 +1420,36 @@ router.post(
       trigger_id,
       configuration,
     };
-
-    if (wf_step_id && wf_step_id !== "undefined") {
-      const wfStep = new WorkflowStep({ id: wf_step_id, ...step });
-
-      await wfStep.update(step);
-      if (req.xhr) res.json({ success: "ok" });
-      else {
-        req.flash("success", req.__("Step saved"));
-        res.redirect(`/actions/configure/${step.trigger_id}`);
+    try {
+      if (wf_step_id && wf_step_id !== "undefined") {
+        const wfStep = new WorkflowStep({ id: wf_step_id, ...step });
+
+        await wfStep.update(step);
+        if (req.xhr) res.json({ success: "ok" });
+        else {
+          req.flash("success", req.__("Step saved"));
+          res.redirect(`/actions/configure/${step.trigger_id}`);
+        }
+      } else {
+        //insert
+
+        const id = await WorkflowStep.create(step);
+        if (req.xhr)
+          res.json({ success: "ok", set_fields: { wf_step_id: id } });
+        else {
+          req.flash("success", req.__("Step saved"));
+          res.redirect(`/actions/configure/${step.trigger_id}`);
+        }
       }
-    } else {
-      //insert
-      const id = await WorkflowStep.create(step);
-      if (req.xhr) res.json({ success: "ok", set_fields: { wf_step_id: id } });
+    } catch (e) {
+      const emsg =
+        e.message ===
+        'duplicate key value violates unique constraint "workflow_steps_name_uniq"'
+          ? `A step with the name ${wf_step_name} already exists`
+          : e.message;
+      if (req.xhr) res.json({ error: emsg });
       else {
-        req.flash("success", req.__("Step saved"));
+        req.flash("error", emsg);
         res.redirect(`/actions/configure/${step.trigger_id}`);
       }
     }
@@ -1463,10 +1496,10 @@ router.get(
               case "Error":
                 return run.error;
               case "Waiting":
-                if (run.wait_info?.form)
+                if (run.wait_info?.form || run.wait_info.output)
                   return a(
                     { href: `/actions/fill-workflow-form/${run.id}` },
-                    "Fill ",
+                    run.wait_info.output ? "Show " : "Fill ",
                     run.current_step
                   );
                 return run.current_step;
@@ -1599,6 +1632,9 @@ router.get(
                   run.status === "Waiting"
                     ? tr(th("Waiting for"), td(JSON.stringify(run.wait_info)))
                     : null,
+                  run.status === "Error"
+                    ? tr(th("Error message"), td(run.error))
+                    : null,
                   tr(
                     th("Context"),
                     td(pre(text(JSON.stringify(run.context, null, 2))))
@@ -1663,7 +1699,8 @@ const getWorkflowStepUserForm = async (run, trigger, step, user) => {
 
   const form = new Form({
     action: `/actions/fill-workflow-form/${run.id}`,
-    blurb: step.configuration?.form_header || "",
+    blurb: run.wait_info.output || step.configuration?.form_header || "",
+    formStyle: run.wait_info.output ? "vert" : undefined,
     fields: (step.configuration.user_form_questions || []).map((q) => ({
       label: q.label,
       name: q.var_name,
@@ -1697,7 +1734,7 @@ router.get(
 
     const form = await getWorkflowStepUserForm(run, trigger, step, req.user);
     if (req.xhr) form.xhrSubmit = true;
-    const title = "Fill form";
+    const title = run.wait_info.output ? "Workflow output" : "Fill form";
     res.sendWrap(title, renderForm(form, req.csrfToken()));
   })
 );
@@ -1791,9 +1828,14 @@ WORKFLOWS TODO
 delete is not always working?
 help file to explain steps, and context
 
-workflow actions: ForLoop, EndForLoop, Output, ReadFile, WriteFile, APIResponse
+action explainer 
+workflow actions: ForLoop, EndForLoop, ReadFile, WriteFile, APIResponse
 
 interactive workflows for not logged in
+correctly suggest new step name
+show end node in diagram
+
+Error handlers
 
 show unconnected steps
 why is code not initialising

package/routes/tables.js

@@ -56,7 +56,7 @@ const {
 } = require("@saltcorn/data/models/discovery");
 const { getState } = require("@saltcorn/data/db/state");
 const { cardHeaderTabs } = require("@saltcorn/markup/layout_utils");
-const { tablesList, viewsList } = require("./common_lists");
+const { tablesList, viewsList, getTriggerList } = require("./common_lists");
 const {
   InvalidConfiguration,
   removeAllWhiteSpace,
@@ -839,22 +839,6 @@ router.get(
             inbound_refs.map((tnm) => link(`/table/${tnm}`, tnm)).join(", ") +
             "<br>"
           : "",
-        triggers.length
-          ? req.__("Table triggers: ") +
-            triggers
-              .map((t) =>
-                link(
-                  `/actions/configure/${
-                    t.id
-                  }?on_done_redirect=${encodeURIComponent(
-                    `table/${table.name}`
-                  )}`,
-                  t.name
-                )
-              )
-              .join(", ") +
-            "<br>"
-          : "",
         !table.external &&
           !table.provider_name &&
           a(
@@ -866,7 +850,8 @@ router.get(
           ),
       ];
     }
-    var viewCard;
+    let viewCard;
+    let triggerCard = "";
     if (fields.length > 0) {
       const views = await View.find(
         table.id ? { table_id: table.id } : { exttable_name: table.name }
@@ -899,6 +884,25 @@ router.get(
             req.__("Create view")
           ),
       };
+
+      triggerCard = {
+        type: "card",
+        id: "table-triggers",
+        title: req.__("Triggers on table"),
+        contents:
+          (triggers.length
+            ? await getTriggerList(triggers, req)
+            : p("Triggers run actions in response to events on this table")) +
+          a(
+            {
+              href: `/actions/new?table=${encodeURIComponent(
+                table.name
+              )}&on_done_redirect=${encodeURIComponent(`table/${table.name}`)}`,
+              class: "btn btn-primary",
+            },
+            req.__("Create trigger")
+          ),
+      };
     }
     const models = await Model.find({ table_id: table.id });
     const modelCard = div(
@@ -1093,6 +1097,7 @@ router.get(
             ]
           : []),
         ...(viewCard ? [viewCard] : []),
+        ...(triggerCard ? [triggerCard] : []),
         {
           type: "card",
           title: req.__("Edit table properties"),
@@ -1177,6 +1182,7 @@ router.post(
       let notify = "";
       if (!rest.versioned) rest.versioned = false;
       if (!rest.has_sync_info) rest.has_sync_info = false;
+      rest.is_user_group = !!rest.is_user_group;
       if (rest.ownership_field_id === "_formula") {
         rest.ownership_field_id = null;
         const fmlValidRes = expressionValidator(rest.ownership_formula);
@@ -1937,7 +1943,7 @@ router.post(
     const table = Table.findOne({ name });
 
     try {
-      await table.deleteRows({}, req.user);
+      await table.deleteRows({}, req.user, true);
       req.flash("success", req.__("Deleted all rows"));
     } catch (e) {
       req.flash("error", e.message);