@saltcorn/server 1.6.0-alpha.2 → 1.6.0-alpha.3

package/routes/actions.js

@@ -48,6 +48,7 @@ const {
   link,
   mkTable,
   localeDateTime,
+  renderWorkflow,
   post_delete_btn,
 } = require("@saltcorn/markup");
 const Form = require("@saltcorn/data/models/form");
@@ -83,6 +84,96 @@ const {
   blocklyToolbox,
 } = require("../markup/blockly.js");
 
+const serializeWorkflowStep = (s, opts = {}) => ({
+  id: s.id,
+  name: s.name,
+  trigger_id: s.trigger_id,
+  next_step: s.next_step || "",
+  only_if: s.only_if || "",
+  action_name: s.action_name,
+  initial_step: !!s.initial_step,
+  configuration: s.configuration || {},
+  summary: WorkflowStep.actionSummary(s, {
+    req: opts.req,
+    trigger: opts.trigger,
+  }),
+});
+
+const buildWorkflowActionExplainers = async (trigger) => {
+  const actionExplainers = {};
+  const stateActions = getState().actions;
+  for (const [name, action] of Object.entries(stateActions)) {
+    if (action.disableInWorkflow) continue;
+    if (action.description) actionExplainers[name] = action.description;
+  }
+  const triggers = await Trigger.find({
+    when_trigger: { or: ["API call", "Never"] },
+  });
+  triggers.forEach((tr) => {
+    if (tr.description) actionExplainers[tr.name] = tr.description;
+  });
+  Object.assign(
+    actionExplainers,
+    WorkflowStep.builtInActionExplainers({
+      api_call: trigger.when_trigger == "API call",
+    })
+  );
+  return actionExplainers;
+};
+
+const workflowStrings = (req, trigger) => ({
+  addStep: req.__("Add step"),
+  editStep: req.__("Edit step"),
+  addAfter: req.__("Add after"),
+  setAsStart: req.__("Set as start"),
+  deleteStep: req.__("Delete"),
+  confirmDelete: req.__("Are you sure?"),
+  start: req.__("Start"),
+  runs: req.__("Show runs"),
+  refresh: req.__("Refresh"),
+  layout: req.__("Auto layout"),
+  empty: req.__("No steps yet"),
+  loading: req.__("Loading"),
+  action: req.__("Action"),
+  nextStep: req.__("Next step"),
+  onlyIf: req.__("Only if"),
+  loopBody: req.__("Loop body"),
+  openRuns: req.__("Show runs »"),
+  configure: req.__(`%s configuration`, trigger.name),
+});
+
+const getWorkflowEditorData = async (req, trigger, stepsIn) => {
+  let steps =
+    stepsIn ||
+    (await WorkflowStep.find({ trigger_id: trigger.id }, { orderBy: "id" }));
+  const initial_step = steps.find((step) => step.initial_step);
+  if (initial_step)
+    steps = [initial_step, ...steps.filter((s) => !s.initial_step)];
+
+  return {
+    trigger: {
+      id: trigger.id,
+      name: trigger.name,
+      when_trigger: trigger.when_trigger,
+    },
+    steps: steps.map((s) => serializeWorkflowStep(s, { req, trigger })),
+    actionExplainers: await buildWorkflowActionExplainers(trigger),
+    csrfToken: req.csrfToken(),
+    strings: workflowStrings(req, trigger),
+    urls: {
+      stepForm: `/actions/stepedit/${trigger.id}`,
+      data: `/actions/workflow/data/${trigger.id}`,
+      connect: `/actions/workflow/connect/${trigger.id}`,
+      positions: `/actions/workflow/positions/${trigger.id}`,
+      sizes: `/actions/workflow/sizes/${trigger.id}`,
+      deleteStep: `/actions/delete-step`,
+      configure: `/actions/configure/${trigger.id}`,
+      runs: `/actions/runs/?trigger=${trigger.id}`,
+    },
+    config: trigger.configuration || {},
+  };
+};
+
 /**
  * Show list of Actions (Triggers) (HTTP GET)
  * @name get
@@ -533,13 +624,10 @@ router.post(
 );
 
 const getWorkflowConfig = async (req, id, table, trigger) => {
-  let steps = await WorkflowStep.find(
+  const steps = await WorkflowStep.find(
     { trigger_id: trigger.id },
     { orderBy: "id" }
   );
-  const initial_step = steps.find((step) => step.initial_step);
-  if (initial_step)
-    steps = [initial_step, ...steps.filter((s) => !s.initial_step)];
   const trigCfgForm = new Form({
     action: addOnDoneRedirect(`/actions/configure/${id}`, req),
     onChange: "saveAndContinue(this)",
@@ -575,73 +663,186 @@ const getWorkflowConfig = async (req, id, table, trigger) => {
       req.csrfToken()
     );
   }
+  const workflowData = await getWorkflowEditorData(req, trigger, steps);
   return (
     copilot_form +
-    pre(
-      { class: "mermaid workflow-config" },
-      WorkflowStep.generate_diagram(steps)
-    ) +
-    script(
-      { defer: "defer" },
-      `function tryAddWFNodes() {
-  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("-");
-      if(cls.includes("init-for-body"))
-        location.href = '/actions/stepedit/${trigger.id}?after_step_for='+idprev+'&before_step='+nmnext;
-      else
-        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) 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)
-     })
-  }
-}
-window.addEventListener('DOMContentLoaded',tryAddWFNodes)`
-    ) +
-    a(
-      {
-        href: `/actions/stepedit/${trigger.id}${
-          initial_step ? "" : "?initial_step=true"
-        }`,
-        class: "btn btn-secondary",
-      },
-      i({ class: "fas fa-plus me-2" }),
-      "Add step"
-    ) +
-    a(
-      {
-        href: `/actions/runs/?trigger=${trigger.id}`,
-        class: "d-block",
-      },
-      "Show runs »"
-    ) +
-    renderForm(trigCfgForm, req.csrfToken())
+    renderWorkflow(workflowData, db.connectObj.version_tag) +
+    div(
+      { class: "mt-3" },
+      a(
+        {
+          href: `/actions/runs/?trigger=${trigger.id}`,
+          class: "d-block mb-2",
+        },
+        req.__("Show runs »")
+      ),
+      renderForm(trigCfgForm, req.csrfToken())
+    )
   );
 };
 
+router.get(
+  "/workflow/data/:trigger_id",
+  isAdminOrHasConfigMinRole("min_role_edit_triggers"),
+  error_catcher(async (req, res) => {
+    const { trigger_id } = req.params;
+    const trigger = await Trigger.findOne({ id: trigger_id });
+    if (!trigger) return res.status(404).json({ error: "Trigger not found" });
+    const data = await getWorkflowEditorData(req, trigger);
+    res.json(data);
+  })
+);
+
+router.post(
+  "/workflow/connect/:trigger_id",
+  isAdminOrHasConfigMinRole("min_role_edit_triggers"),
+  error_catcher(async (req, res) => {
+    const { trigger_id } = req.params;
+    const { step_id, next_step, initial_step, loop_body_step } = req.body || {};
+    const stepId = step_id ? +step_id : null;
+    const step = await WorkflowStep.findOne({ id: stepId, trigger_id });
+    if (!step) return res.status(404).json({ error: "Step not found" });
+    const allSteps = await WorkflowStep.find({ trigger_id });
+    const previouslyInitial = allSteps.find(
+      (s) => s.initial_step && s.id !== step.id
+    );
+    const updateRow = {};
+    if (typeof next_step !== "undefined")
+      updateRow.next_step = next_step || null;
+    if (initial_step !== undefined)
+      updateRow.initial_step = initial_step === "true" || initial_step === true;
+    if (
+      updateRow.initial_step === true &&
+      previouslyInitial &&
+      typeof updateRow.next_step === "undefined" &&
+      !step.next_step
+    ) {
+      updateRow.next_step = previouslyInitial.name;
+    }
+    if (
+      typeof loop_body_step !== "undefined" &&
+      step.action_name === "ForLoop"
+    ) {
+      updateRow.configuration = {
+        ...step.configuration,
+        loop_body_initial_step: loop_body_step || "",
+      };
+    }
+    await step.update(updateRow);
+    const trigger = await Trigger.findOne({ id: trigger_id });
+    Trigger.emitEvent(
+      "AppChange",
+      `Trigger ${trigger?.name || step.trigger_id}`,
+      req.user,
+      {
+        entity_type: "Trigger",
+        entity_name: trigger?.name || step.trigger_id,
+      }
+    );
+    res.json({ success: "ok" });
+  })
+);
+
+router.post(
+  "/workflow/positions/:trigger_id",
+  isAdminOrHasConfigMinRole("min_role_edit_triggers"),
+  error_catcher(async (req, res) => {
+    const trigger_id = +req.params.trigger_id;
+    const { positions } = req.body || {};
+    if (!Array.isArray(positions))
+      return res.status(400).json({ error: "positions array required" });
+
+    const numeric = (v) => (typeof v === "string" ? +v : v);
+
+    let startPos = null;
+
+    for (const pos of positions) {
+      if (!pos || !pos.id) continue;
+      const x = numeric(pos.x);
+      const y = numeric(pos.y);
+      if (!Number.isFinite(x) || !Number.isFinite(y)) continue;
+      if (String(pos.id) === "start") {
+        startPos = { x, y };
+        continue;
+      }
+      const step = await WorkflowStep.findOne({ id: +pos.id, trigger_id });
+      if (!step) continue;
+      await step.update({
+        configuration: {
+          ...(step.configuration || {}),
+          workflow_position: { x, y },
+        },
+      });
+    }
+
+    const trigger = await Trigger.findOne({ id: trigger_id });
+    if (startPos) {
+      await Trigger.update(trigger_id, {
+        configuration: {
+          ...(trigger?.configuration || {}),
+          workflow_start_position: startPos,
+        },
+      });
+    }
+    Trigger.emitEvent(
+      "AppChange",
+      trigger,
+      req.user
+        ? {
+            user_id: req.user.id,
+            role_id: req.user.role_id,
+            entity_type: "Trigger",
+            entity_name: trigger?.name || trigger_id,
+          }
+        : undefined
+    );
+    res.json({ success: "ok" });
+  })
+);
+
+router.post(
+  "/workflow/sizes/:trigger_id",
+  isAdminOrHasConfigMinRole("min_role_edit_triggers"),
+  error_catcher(async (req, res) => {
+    const trigger_id = +req.params.trigger_id;
+    const { sizes } = req.body || {};
+    if (!Array.isArray(sizes))
+      return res.status(400).json({ error: "sizes array required" });
+
+    const numeric = (v) => (typeof v === "string" ? +v : v);
+
+    for (const size of sizes) {
+      if (!size || !size.id) continue;
+      const width = numeric(size.width);
+      const height = numeric(size.height);
+      if (!Number.isFinite(width) || !Number.isFinite(height)) continue;
+      const step = await WorkflowStep.findOne({ id: +size.id, trigger_id });
+      if (!step) continue;
+      await step.update({
+        configuration: {
+          ...(step.configuration || {}),
+          workflow_size: { width, height },
+        },
+      });
+    }
+
+    const trigger = await Trigger.findOne({ id: trigger_id });
+    Trigger.emitEvent(
+      "AppChange",
+      trigger,
+      req.user
+        ? {
+            user_id: req.user.id,
+            role_id: req.user.role_id,
+            entity_type: "Trigger",
+            entity_name: trigger?.name || trigger_id,
+          }
+        : undefined
+    );
+    res.json({ success: "ok" });
+  })
+);
+
 const getWorkflowStepForm = async (
   trigger,
   req,
@@ -745,19 +946,20 @@ const getWorkflowStepForm = async (
 
   const form = new Form({
     action: addOnDoneRedirect(`/actions/stepedit/${trigger.id}`, req),
-    onChange: step_id ? "saveAndContinueIfValid(this)" : undefined,
-    submitLabel: step_id ? req.__("Done") : undefined,
-    onSubmit: "press_store_button(this)",
-    additionalButtons: step_id
-      ? [
-          {
-            label: req.__("Delete"),
-            class: "btn btn-outline-danger",
-            onclick: `ajax_post('/actions/delete-step/${+step_id}')`,
-            afterSave: true,
-          },
-        ]
-      : undefined,
+    // submitLabel: step_id ? req.__("Done") : undefined,
+    // submitLabel: null,
+    // onSubmit: "press_store_button(this)",
+    // additionalButtons: step_id
+    //   ? [
+    //       {
+    //         label: req.__("Delete"),
+    //         class: "btn btn-outline-danger",
+    //         onclick: `ajax_post('/actions/delete-step/${+step_id}')`,
+    //         afterSave: true,
+    //       },
+    //     ]
+    //   : undefined,
+    noSubmitButton: true,
     fields: [
       {
         input_type: "section_header",
@@ -964,18 +1166,6 @@ router.get(
         active_sub: "Triggers",
         sub2_page: "Configure",
         page_title: req.__(`%s configuration`, trigger.name),
-        headers: [
-          {
-            script: `/static_assets/${db.connectObj.version_tag}/mermaid.min.js`,
-          },
-          {
-            headerTag: `<script type="module">mermaid.initialize({securityLevel: 'loose'${
-              getState().getLightDarkMode(req.user) === "dark"
-                ? ",theme: 'dark',"
-                : ""
-            }});</script>`,
-          },
-        ],
         contents: {
           type: "card",
           titleAjaxIndicator: true,
@@ -1407,6 +1597,15 @@ router.get(
       while (stepNames.has(`step${name_ix}`)) name_ix += 1;
       form.values.wf_step_name = `step${name_ix}`;
     }
+    const formHtml = renderForm(form, req.csrfToken());
+    const titleText = req.__(`%s configuration`, trigger.name);
+    if (req.xhr || req.query.render === "dialog") {
+      res.json({
+        title: titleText,
+        form: formHtml,
+      });
+      return;
+    }
     send_events_page({
       res,
       req,
@@ -1420,7 +1619,7 @@ router.get(
           "Configure trigger %s",
           a({ href: `/actions/configure/${trigger.id}` }, trigger.name)
         ),
-        contents: renderForm(form, req.csrfToken()),
+        contents: formHtml,
       },
     });
   })
@@ -1467,9 +1666,44 @@ router.post(
       _after_step_for,
       ...configuration
     } = form.values;
+    const DEFAULT_NODE_WIDTH = 220;
+    const H_GAP = 60;
+    const existingStep =
+      wf_step_id && wf_step_id !== "undefined"
+        ? await WorkflowStep.findOne({ id: wf_step_id, trigger_id })
+        : null;
+    const stepsForTrigger = await WorkflowStep.find({ trigger_id });
+    const previouslyInitial = existingStep
+      ? stepsForTrigger.find((s) => s.initial_step && s.id !== existingStep.id)
+      : stepsForTrigger.find((s) => s.initial_step);
     Object.entries(configuration).forEach(([k, v]) => {
       if (v === null) delete configuration[k];
     });
+    // set position if not set and after_step is given
+    if (
+      (!wf_step_id || wf_step_id === "undefined") &&
+      _after_step &&
+      _after_step !== "undefined" &&
+      !configuration.workflow_position
+    ) {
+      const afterStep = await WorkflowStep.findOne({
+        id: _after_step,
+        trigger_id,
+      });
+      const afterPos = afterStep?.configuration?.workflow_position;
+      if (afterPos) {
+        const size = afterStep?.configuration?.workflow_size || {};
+        const width = Number(size.width);
+        const useWidth = Number.isFinite(width) ? width : DEFAULT_NODE_WIDTH;
+        const x = Number(afterPos.x);
+        const y = Number(afterPos.y);
+        if (Number.isFinite(x) && Number.isFinite(y))
+          configuration.workflow_position = {
+            x: x + useWidth + H_GAP,
+            y,
+          };
+      }
+    }
     const step = {
       name: wf_step_name,
       action_name: wf_action_name,
@@ -1484,6 +1718,14 @@ router.post(
         const wfStep = new WorkflowStep({ id: wf_step_id, ...step });
 
         await wfStep.update(step);
+        if (
+          wf_initial_step &&
+          previouslyInitial &&
+          previouslyInitial.id !== wfStep.id &&
+          !wfStep.next_step
+        ) {
+          await wfStep.update({ next_step: previouslyInitial.name });
+        }
         if (req.xhr) res.json({ success: "ok" });
         else {
           req.flash("success", req.__("Step saved"));
@@ -1493,6 +1735,11 @@ router.post(
         //insert
 
         const id = await WorkflowStep.create(step);
+        if (wf_initial_step && previouslyInitial && !step.next_step) {
+          const newStep = await WorkflowStep.findOne({ id, trigger_id });
+          if (newStep && !newStep.next_step)
+            await newStep.update({ next_step: previouslyInitial.name });
+        }
         if (req.xhr)
           res.json({ success: "ok", set_fields: { wf_step_id: id } });
         else {
@@ -1524,6 +1771,25 @@ router.post(
             },
           });
       }
+
+      // if the step was renamed, update references from other steps
+      if (existingStep && existingStep.name !== step.name) {
+        const stepsForTrigger = await WorkflowStep.find({ trigger_id });
+        for (const s of stepsForTrigger) {
+          const update = {};
+          if (s.next_step === existingStep.name) update.next_step = step.name;
+          if (
+            s.action_name === "ForLoop" &&
+            s.configuration?.loop_body_initial_step === existingStep.name
+          ) {
+            update.configuration = {
+              ...s.configuration,
+              loop_body_initial_step: step.name,
+            };
+          }
+          if (Object.keys(update).length) await s.update(update);
+        }
+      }
     } catch (e) {
       console.error(e);
       const emsg =

package/routes/common_lists.js

@@ -170,15 +170,16 @@ const editViewRoleForm = (view, roles, req, on_done_redirect_str) =>
  * @param {object} req
  * @returns {div}
  */
-const view_dropdown = (view, req, on_done_redirect_str = "") =>
+const view_dropdown = (view, req, on_done_redirect_str = "", includeRun = true) =>
   settingsDropdown(`dropdownMenuButton${view.id}`, [
-    a(
-      {
-        class: "dropdown-item",
-        href: `/view/${encodeURIComponent(view.name)}`,
-      },
-      '<i class="fas fa-running"></i>&nbsp;' + req.__("Run")
-    ),
+    includeRun &&
+      a(
+        {
+          class: "dropdown-item",
+          href: `/view/${encodeURIComponent(view.name)}`,
+        },
+        '<i class="fas fa-running"></i>&nbsp;' + req.__("Run")
+      ),
     view.id &&
       a(
         {
@@ -502,16 +503,18 @@ const page_dropdown = (
   page,
   req,
   on_done_redirect_str = "",
-  includeTestRun = false
+  includeTestRun = false,
+  includeRun = true
 ) =>
   settingsDropdown(`dropdownMenuButton${page.id}`, [
-    a(
-      {
-        class: "dropdown-item",
-        href: `/page/${encodeURIComponent(page.name)}`,
-      },
-      '<i class="fas fa-running"></i>&nbsp;' + req.__("Run")
-    ),
+    includeRun &&
+      a(
+        {
+          class: "dropdown-item",
+          href: `/page/${encodeURIComponent(page.name)}`,
+        },
+        '<i class="fas fa-running"></i>&nbsp;' + req.__("Run")
+      ),
     includeTestRun &&
       a(
         {

package/routes/entities.js

@@ -88,6 +88,10 @@ const getAllEntities = async () => {
 
   // Add views
   views.forEach((v) => {
+    const has_config =
+      v.configuration &&
+      typeof v.configuration === "object" &&
+      Object.keys(v.configuration).length > 0;
     entities.push({
       type: "view",
       name: v.name,
@@ -102,6 +106,7 @@ const getAllEntities = async () => {
         table_name: v.table_id ? tableNameById.get(v.table_id) : null,
         singleton: v.singleton,
         min_role: v.min_role,
+        has_config,
       },
     });
   });
@@ -327,11 +332,11 @@ router.get(
       if (entity.type === "table")
         return tableActionsDropdown(entity, req, user_can_edit_tables);
       if (entity.type === "view")
-        return view_dropdown(entity, req, on_done_redirect_str);
+        return view_dropdown(entity, req, on_done_redirect_str, false);
       if (entity.type === "page")
-        return page_dropdown(entity, req, on_done_redirect_str, true);
+        return page_dropdown(entity, req, on_done_redirect_str, true, false);
       if (entity.type === "trigger")
-        return trigger_dropdown(entity, req, on_done_redirect_str, true);
+        return trigger_dropdown(entity, req, on_done_redirect_str, false);
       return "";
     };
 
@@ -448,6 +453,7 @@ router.get(
     const headerRow = tr(
       th(req.__("Type")),
       th(req.__("Name")),
+      th(req.__("Run")),
       th(req.__("Details")),
       th(req.__("Access | Read/Write")),
       th(req.__("Tags")),
@@ -523,6 +529,39 @@ router.get(
             ? `/viewedit/config/${encodeURIComponent(entity.name)}${on_done_redirect_str}`
             : entity.viewLink;
       const actionsMenu = buildActionMenu(entity);
+      const runCell = (() => {
+        if (entity.type === "view") {
+          return a(
+            {
+              href: entity.viewLink,
+              class: "btn btn-sm btn-outline-primary",
+            },
+            i({ class: "fas fa-play me-1" }),
+            req.__("Run")
+          );
+        }
+        if (entity.type === "page") {
+          return a(
+            {
+              href: entity.viewLink,
+              class: "btn btn-sm btn-outline-primary",
+            },
+            i({ class: "fas fa-play me-1" }),
+            req.__("Run")
+          );
+        }
+        if (entity.type === "trigger") {
+          return a(
+            {
+              href: `/actions/testrun/${entity.id}${on_done_redirect_str}`,
+              class: "btn btn-sm btn-outline-primary",
+            },
+            i({ class: "fas fa-running me-1" }),
+            req.__("Test run")
+          );
+        }
+        return "";
+      })();
       return tr(
         {
           class: "entity-row",
@@ -532,7 +571,14 @@ router.get(
           "data-tags": tagIds.join(" "),
         },
         td(entityTypeBadge(entity.type)),
-        td(a({ href: mainLinkHref, class: "fw-bold" }, text(entity.name))),
+        td(
+          entity.type === "view" &&
+          !entity.metadata.table_id &&
+          !entity.metadata.has_config
+            ? span({ class: "fw-bold" }, text(entity.name))
+            : a({ href: mainLinkHref, class: "fw-bold" }, text(entity.name))
+        ),
+        td(runCell),
         td(detailsContent(entity, req)),
         td(
           text(
@@ -798,8 +844,8 @@ router.get(
         .entity-filter-btn { transition: all 0.15s ease-in-out; }
         .tag-filter-btn { transition: all 0.15s ease-in-out; }
         /* Show plus badge only on hover over tag cell */
-        td:nth-child(5) .add-tag { visibility: hidden; cursor: pointer; }
-        tr:hover td:nth-child(5) .add-tag { visibility: visible; }
+        td:nth-child(6) .add-tag { visibility: hidden; cursor: pointer; }
+        tr:hover td:nth-child(6) .add-tag { visibility: visible; }
       </style>
     `;