@saltcorn/server 1.1.1-beta.1 → 1.1.1-beta.3

package/routes/actions.js

@@ -14,6 +14,10 @@ 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");
@@ -441,6 +445,10 @@ router.post(
         const tr = await Trigger.create(form.values);
         id = tr.id;
       }
+      Trigger.emitEvent("AppChange", `Trigger ${form.values.name}`, req.user, {
+        entity_type: "Trigger",
+        entity_name: form.values.name,
+      });
       res.redirect(addOnDoneRedirect(`/actions/configure/${id}`, req));
     }
   })
@@ -482,6 +490,10 @@ router.post(
           ...form.values.configuration,
         };
       await Trigger.update(trigger.id, form.values); //{configuration: form.values});
+      Trigger.emitEvent("AppChange", `Trigger ${trigger.name}`, req.user, {
+        entity_type: "Trigger",
+        entity_name: trigger.name,
+      });
       if (req.xhr) {
         res.json({ success: "ok" });
         return;
@@ -496,14 +508,19 @@ function genWorkflowDiagram(steps) {
   const stepNames = steps.map((s) => s.name);
   const nodeLines = steps.map(
     (s) => `  ${s.mmname}["\`**${s.name}**
-  ${s.action_name}\`"]:::wfstep${s.id}`
+  ${s.action_name}\`"]:::wfstep${s.id}${s.only_if ? "@{ shape: hex }" : ""}`
   );
 
   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.mmname}`);
+    if (step.initial_step)
+      linkLines.push(
+        `  _Start-- <i class="fas fa-plus add-btw-nodes btw-nodes-${0}-${
+          step.name
+        }"></i> ---${step.mmname}`
+      );
     if (stepNames.includes(step.next_step)) {
       linkLines.push(
         `  ${step.mmname}-- <i class="fas fa-plus add-btw-nodes btw-nodes-${step.id}-${step.next_step}"></i> ---${step.mmnext}`
@@ -533,9 +550,11 @@ function genWorkflowDiagram(steps) {
     }
     if (step.action_name === "ForLoop") {
       linkLines.push(
-        `  ${step.mmname}-.->${WorkflowStep.mmescape(step.configuration.loop_body_initial_step)}`
+        `  ${step.mmname}-.->${WorkflowStep.mmescape(
+          step.configuration.loop_body_initial_step
+        )}`
       );
-    } 
+    }
     if (step.action_name === "EndForLoop") {
       // TODO this is not correct. improve.
       let forStep;
@@ -711,11 +730,23 @@ const getWorkflowStepForm = async (
             },
           };
         if (cfgFld.input_type === "code") cfgFld.input_type = "textarea";
-        actionConfigFields.push(cfgFld);
       }
     } catch {}
   }
-  const builtInActionExplainers = WorkflowStep.builtInActionExplainers();
+  actionConfigFields.push({
+    label: "Subcontext",
+    name: "subcontext",
+    type: "String",
+    sublabel:
+      "Optional. A key on the current workflow's context, the values of which will be the called workflow's context.",
+    showIf: {
+      wf_action_name: Trigger.find({ action: "Workflow" }).map((wf) => wf.name),
+    },
+  });
+
+  const builtInActionExplainers = WorkflowStep.builtInActionExplainers({
+    api_call: trigger.when_trigger == "API call",
+  });
   const actionsNotRequiringRow = Trigger.action_options({
     notRequireRow: true,
     noMultiStep: true,
@@ -730,7 +761,9 @@ const getWorkflowStepForm = async (
     if (tr.description) actionExplainers[tr.name] = tr.description;
   });
   Object.assign(actionExplainers, builtInActionExplainers);
-  actionConfigFields.push(...(await WorkflowStep.builtInActionConfigFields()));
+  actionConfigFields.push(
+    ...(await WorkflowStep.builtInActionConfigFields({ trigger }))
+  );
 
   const form = new Form({
     action: addOnDoneRedirect(`/actions/stepedit/${trigger.id}`, req),
@@ -804,7 +837,8 @@ const getWorkflowStepForm = async (
   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 (after_step == "0") form.values.wf_initial_step = true;
+  else 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");
@@ -1142,6 +1176,10 @@ router.post(
       await Trigger.update(trigger.id, {
         configuration: { ...trigger.configuration, ...form.values },
       });
+      Trigger.emitEvent("AppChange", `Trigger ${trigger.name}`, req.user, {
+        entity_type: "Trigger",
+        entity_name: trigger.name,
+      });
       if (req.xhr) {
         res.json({ success: "ok" });
         return;
@@ -1168,6 +1206,10 @@ router.post(
   error_catcher(async (req, res) => {
     const { id } = req.params;
     const trigger = await Trigger.findOne({ id });
+    Trigger.emitEvent("AppChange", `Trigger ${trigger.name}`, req.user, {
+      entity_type: "Trigger",
+      entity_name: trigger.name,
+    });
     await trigger.delete();
     res.redirect(`/actions/`);
   })
@@ -1296,6 +1338,10 @@ router.post(
     const { id } = req.params;
     const trig = await Trigger.findOne({ id });
     const newtrig = await trig.clone();
+    Trigger.emitEvent("AppChange", `Trigger ${newtrig.name}`, req.user, {
+      entity_type: "Trigger",
+      entity_name: newtrig.name,
+    });
     req.flash(
       "success",
       req.__("Trigger %s duplicated as %s", trig.name, newtrig.name)
@@ -1425,6 +1471,10 @@ router.post(
           res.redirect(`/actions/configure/${step.trigger_id}`);
         }
       }
+      Trigger.emitEvent("AppChange", `Trigger ${trigger.name}`, req.user, {
+        entity_type: "Trigger",
+        entity_name: trigger.name,
+      });
       if (_after_step && _after_step !== "undefined") {
         const astep = await WorkflowStep.findOne({
           id: _after_step,
@@ -1465,6 +1515,10 @@ router.post(
       step.trigger_id = trigger.id;
       await WorkflowStep.create(step);
     }
+    Trigger.emitEvent("AppChange", `Trigger ${trigger.name}`, req.user, {
+      entity_type: "Trigger",
+      entity_name: trigger.name,
+    });
     res.redirect(`/actions/configure/${trigger.id}`);
   })
 );
@@ -1687,6 +1741,28 @@ 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({
@@ -1819,12 +1895,11 @@ WORKFLOWS TODO
 
 help file to explain steps, and context
 
-workflow actions: ForLoop, EndForLoop, ReadFile, WriteFile, APIResponse
+workflow actions: ReadFile, WriteFile, 
 
-Error handlers
+EditViewForm: presets. response var can be blank
 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
 
 show unconnected steps