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

package/locales/pl.json

@@ -1508,5 +1508,20 @@
 	"Workflow runs": "Przepływ pracy jest uruchomiony",
 	"Workflow run": "Uruchomienie przepływu pracy",
 	"Share to enabled": "Udostępnij włączone",
-	"Enable the share to feature": "Włącz udostępnianie funkcji"
+	"Enable the share to feature": "Włącz udostępnianie funkcji",
+  "Allocate new row": "Przydziel nowy wiersz",
+  "If the view is run without existing row, allocate a new row on load. Defaults must be set on all required fields.": "Jeśli widok jest uruchamiany bez istniejącego wiersza, przydziel nowy wiersz podczas ładowania. Domyślne wartości muszą być ustawione na wszystkich wymaganych polach.",
+  "Step traces": "Ślady kroków",
+  "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.": "Wprowadź wersję w formacie 'x.y.z' (np. 0.0.1 z liczbami od 0 do 999) lub pozostaw puste.",
+  "Delete unchanged": "Usuń bez zmian",
+  "Delete allocated row if there are no changes.": "Usuń przydzielony wiersz, jeśli nie wprowadzono żadnych zmian.",
+  "Triggers on table": "Wyzwalacze na tabeli",
+  "Please provide the keystore alias and password for the android build.": "Podaj alias i hasło do keystore dla kompilacji Android.",
+  "Submit": "Prześlij",
+  "OK": "OK",
+  "Step settings": "Ustawienia kroku",
+  "Action settings": "Ustawienia akcji",
+  "Workflow": "Przepływ pracy",
+  "Previous runs": "Poprzednie uruchomienia",
+  "The workflow the user will be interacting with.": "Przepływ pracy, z którym użytkownik będzie wchodził w interakcję."
 }

package/package.json

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

package/routes/actions.js

@@ -11,7 +11,7 @@ const {
   addOnDoneRedirect,
   is_relative_url,
 } = require("./utils.js");
-const { ppVal } = require("@saltcorn/data/utils");
+const { ppVal, jsIdentifierValidator } = require("@saltcorn/data/utils");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
@@ -495,7 +495,7 @@ router.post(
 function genWorkflowDiagram(steps) {
   const stepNames = steps.map((s) => s.name);
   const nodeLines = steps.map(
-    (s) => `  ${s.name}["\`**${s.name}**
+    (s) => `  ${s.mmname}["\`**${s.name}**
   ${s.action_name}\`"]:::wfstep${s.id}`
   );
 
@@ -503,36 +503,39 @@ function genWorkflowDiagram(steps) {
   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}`
-      );
-    } else if (stepNames.includes(step.next_step)) {
+    if (step.initial_step) linkLines.push(`  _Start --> ${step.mmname}`);
+    if (stepNames.includes(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}`
+        `  ${step.mmname}-- <i class="fas fa-plus add-btw-nodes btw-nodes-${step.id}-${step.next_step}"></i> ---${step.mmnext}`
       );
     } else if (step.next_step) {
       let found = false;
       for (const otherStep of stepNames)
         if (step.next_step.includes(otherStep)) {
-          linkLines.push(`  ${step.name} --> ${otherStep}`);
+          linkLines.push(
+            `  ${step.mmname} --> ${WorkflowStep.mmescape(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}`
+          `  ${step.mmname}-- <a href="/actions/stepedit/${step.trigger_id}/${step.id}">Error: missing next step in ${step.mmname}</a> ---_End_${step.mmname}`
         );
         nodeLines.push(
-          `  _End_${step.name}:::wfadd${step.id}@{ shape: circle, label: "<i class='fas fa-plus with-link'></i>" }`
+          `  _End_${step.mmname}:::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}`);
+      linkLines.push(`  ${step.mmname} --> _End_${step.mmname}`);
       nodeLines.push(
-        `  _End_${step.name}:::wfadd${step.id}@{ shape: circle, label: "<i class='fas fa-plus with-link'></i>" }`
+        `  _End_${step.mmname}:::wfadd${step.id}@{ shape: circle, label: "<i class='fas fa-plus with-link'></i>" }`
       );
     }
+    if (step.action_name === "ForLoop") {
+      linkLines.push(
+        `  ${step.mmname}-.->${WorkflowStep.mmescape(step.configuration.loop_body_initial_step)}`
+      );
+    } 
     if (step.action_name === "EndForLoop") {
       // TODO this is not correct. improve.
       let forStep;
@@ -542,7 +545,7 @@ function genWorkflowDiagram(steps) {
           break;
         }
       }
-      if (forStep) linkLines.push(`  ${step.name} --> ${forStep.name}`);
+      if (forStep) linkLines.push(`  ${step.mmname} --> ${forStep.mmname}`);
     }
     step_ix += 1;
   }
@@ -581,7 +584,29 @@ const getWorkflowConfig = async (req, id, table, trigger) => {
     ],
   });
   trigCfgForm.values = trigger.configuration;
+  let copilot_form = "";
+
+  if (getState().functions.copilot_generate_workflow) {
+    copilot_form = renderForm(
+      new Form({
+        action: `/actions/gen-copilot/${id}`,
+        values: { description: trigger.description || "" },
+        submitLabel: "Generate workflow with copilot",
+        formStyle: "vert",
+        fields: [
+          {
+            name: "description",
+            label: "Description",
+            type: "String",
+            fieldview: "textarea",
+          },
+        ],
+      }),
+      req.csrfToken()
+    );
+  }
   return (
+    copilot_form +
     pre({ class: "mermaid" }, genWorkflowDiagram(steps)) +
     script(
       { defer: "defer" },
@@ -641,16 +666,6 @@ window.addEventListener('DOMContentLoaded',tryAddWFNodes)`
   );
 };
 
-const jsIdentifierValidator = (s) => {
-  if (!s) return "An identifier is required";
-  if (s.includes(" ")) return "Spaces not allowd";
-  let badc = "'#:/\\@()[]{}\"!%^&*-+*~<>,.?|"
-    .split("")
-    .find((c) => s.includes(c));
-
-  if (badc) return `Character ${badc} not allowed`;
-};
-
 const getWorkflowStepForm = async (
   trigger,
   req,
@@ -700,19 +715,12 @@ const getWorkflowStepForm = async (
       }
     } catch {}
   }
+  const builtInActionExplainers = WorkflowStep.builtInActionExplainers();
   const actionsNotRequiringRow = Trigger.action_options({
     notRequireRow: true,
     noMultiStep: true,
     builtInLabel: "Workflow Actions",
-    builtIns: [
-      "SetContext",
-      "TableQuery",
-      "Output",
-      "DataOutput",
-      "WaitUntil",
-      "WaitNextTick",
-      "UserForm",
-    ],
+    builtIns: Object.keys(builtInActionExplainers),
     forWorkflow: true,
   });
   const triggers = Trigger.find({
@@ -721,152 +729,8 @@ const getWorkflowStepForm = async (
   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.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)";
-  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" },
-  });
-  actionConfigFields.push({
-    label: "User ID",
-    name: "user_id_expression",
-    type: "String",
-    sublabel: "Optional. If blank assigned to user starting the workflow",
-    showIf: { wf_action_name: "UserForm" },
-  });
-  actionConfigFields.push({
-    label: "Resume at",
-    name: "resume_at",
-    sublabel:
-      "JavaScript expression for the time to resume. <code>moment</code> is in scope.",
-    type: "String",
-    showIf: { wf_action_name: "WaitUntil" },
-  });
-  actionConfigFields.push({
-    label: "Context values",
-    name: "ctx_values",
-    sublabel:
-      "JavaScript object expression for the variables to set. Example <code>{x: 5, y:y+1}</code> will set x to 5 and increment existing context variable y",
-    type: "String",
-    fieldview: "textarea",
-    class: "validate-expression",
-    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: "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",
-    type: "String",
-    required: true,
-    attributes: { options: (await Table.find()).map((t) => t.name) },
-    showIf: { wf_action_name: "TableQuery" },
-  });
-  actionConfigFields.push({
-    label: "Query",
-    name: "query_object",
-    sublabel: "Where object, example <code>{manager: 1}</code>",
-    type: "String",
-    required: true,
-    class: "validate-expression",
-    default: "{}",
-    showIf: { wf_action_name: "TableQuery" },
-  });
-  actionConfigFields.push({
-    label: "Variable",
-    name: "query_variable",
-    sublabel: "Context variable to write to query results to",
-    type: "String",
-    required: true,
-    validator: jsIdentifierValidator,
-    showIf: { wf_action_name: "TableQuery" },
-  });
-  actionConfigFields.push(
-    new FieldRepeat({
-      name: "user_form_questions",
-      showIf: { wf_action_name: "UserForm" },
-      fields: [
-        {
-          label: "Label",
-          name: "label",
-          type: "String",
-          sublabel:
-            "The text that will shown to the user above the input elements",
-        },
-        {
-          label: "Variable name",
-          name: "var_name",
-          type: "String",
-          sublabel:
-            "The answer will be set in the context with this variable name",
-          validator: jsIdentifierValidator,
-        },
-        {
-          label: "Input Type",
-          name: "qtype",
-          type: "String",
-          required: true,
-          attributes: {
-            options: [
-              "Yes/No",
-              "Checkbox",
-              "Free text",
-              "Multiple choice",
-              //"Multiple checks",
-              "Integer",
-              "Float",
-              //"File upload",
-            ],
-          },
-        },
-        {
-          label: "Options",
-          name: "options",
-          type: "String",
-          sublabel: "Comma separated list of multiple choice options",
-          showIf: { qtype: ["Multiple choice", "Multiple checks"] },
-        },
-      ],
-    })
-  );
+  Object.assign(actionExplainers, builtInActionExplainers);
+  actionConfigFields.push(...(await WorkflowStep.builtInActionConfigFields()));
 
   const form = new Form({
     action: addOnDoneRedirect(`/actions/stepedit/${trigger.id}`, req),
@@ -1561,7 +1425,7 @@ router.post(
           res.redirect(`/actions/configure/${step.trigger_id}`);
         }
       }
-      if (_after_step) {
+      if (_after_step && _after_step !== "undefined") {
         const astep = await WorkflowStep.findOne({
           id: _after_step,
           trigger_id,
@@ -1583,6 +1447,28 @@ router.post(
   })
 );
 
+router.post(
+  "/gen-copilot/:trigger_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { trigger_id } = req.params;
+    const trigger = await Trigger.findOne({ id: trigger_id });
+    await WorkflowStep.deleteForTrigger(trigger.id);
+    const description = req.body.description;
+    await Trigger.update(trigger.id, { description });
+    const steps = await getState().functions.copilot_generate_workflow.run(
+      description,
+      trigger.id
+    );
+    if (steps.length) steps[0].initial_step = true;
+    for (const step of steps) {
+      step.trigger_id = trigger.id;
+      await WorkflowStep.create(step);
+    }
+    res.redirect(`/actions/configure/${trigger.id}`);
+  })
+);
+
 router.post(
   "/delete-step/:step_id",
   isAdmin,

package/routes/utils.js

@@ -107,6 +107,7 @@ const setLanguage = (req, res, state) => {
   } else if (req.cookies?.lang) {
     req.setLocale(req.cookies?.lang);
   }
+  if (req.user) Object.freeze(req.user);
   set_custom_http_headers(res, req, state);
 };
 

package/tests/view.test.js

@@ -194,6 +194,43 @@ describe("render view with slug", () => {
   });
 });
 
+describe("frozen user object", () => {
+  it("should create view writing to user object", async () => {
+    const table = Table.findOne({ name: "books" });
+    const configuration = {
+      layout: {
+        type: "container",
+        style: {},
+        contents: {
+          type: "blank",
+          contents: "'userid='+user.id",
+          isFormula: {
+            text: true,
+          },
+        },
+        showIfFormula: "user.id=1",
+      },
+      columns: [],
+    };
+    await View.create({
+      table_id: table.id,
+      name: "ShowBookWriteUser",
+      viewtemplate: "Show",
+      configuration,
+      min_role: 100,
+    });
+  });
+  it("should run view setting user", async () => {
+    const loginCookie = await getStaffLoginCookie();
+
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/view/ShowBookWriteUser?id=1")
+      .set("Cookie", loginCookie)
+      .expect(toInclude(">userid=2</div>"));
+  });
+});
+
 describe("action row_variable", () => {
   const createFilterView = async ({
     configuration,