Merge pull request #1739 from Budibase/fix/automation-scripts

Fixing automation JS scripts

packages/server/src/api/controllers/script.js

@@ -3,13 +3,15 @@ const vm = require("vm")
 
 class ScriptExecutor {
   constructor(body) {
-    this.script = new vm.Script(body.script)
+    const code = `let fn = () => {\n${body.script}\n}; out = fn();`
+    this.script = new vm.Script(code)
     this.context = vm.createContext(body.context)
     this.context.fetch = fetch
   }
 
   execute() {
-    return this.script.runInContext(this.context)
+    this.script.runInContext(this.context)
+    return this.context.out
   }
 }
 

packages/server/src/automations/actions.js

@@ -7,6 +7,7 @@ const executeScript = require("./steps/executeScript")
 const bash = require("./steps/bash")
 const executeQuery = require("./steps/executeQuery")
 const outgoingWebhook = require("./steps/outgoingWebhook")
+const serverLog = require("./steps/serverLog")
 const env = require("../environment")
 const Sentry = require("@sentry/node")
 const {
@@ -24,6 +25,7 @@ const BUILTIN_ACTIONS = {
   EXECUTE_SCRIPT: executeScript.run,
   EXECUTE_BASH: bash.run,
   EXECUTE_QUERY: executeQuery.run,
+  SERVER_LOG: serverLog.run,
 }
 const BUILTIN_DEFINITIONS = {
   SEND_EMAIL: sendgridEmail.definition,
@@ -35,6 +37,7 @@ const BUILTIN_DEFINITIONS = {
   EXECUTE_SCRIPT: executeScript.definition,
   EXECUTE_QUERY: executeQuery.definition,
   EXECUTE_BASH: bash.definition,
+  SERVER_LOG: serverLog.definition,
 }
 
 let MANIFEST = null

packages/server/src/automations/steps/serverLog.js

@@ -0,0 +1,41 @@
+/**
+ * Note, there is some functionality in this that is not currently exposed as it
+ * is complex and maybe better to be opinionated here.
+ * GET/DELETE requests cannot handle body elements so they will not be sent if configured.
+ */
+
+module.exports.definition = {
+  name: "Backend log",
+  tagline: "Console log a value in the backend",
+  icon: "ri-server-line",
+  description: "Logs the given text to the server (using console.log)",
+  type: "ACTION",
+  stepId: "SERVER_LOG",
+  inputs: {
+    text: "",
+  },
+  schema: {
+    inputs: {
+      properties: {
+        text: {
+          type: "string",
+          title: "URL",
+        },
+      },
+      required: ["text"],
+    },
+    outputs: {
+      properties: {
+        success: {
+          type: "boolean",
+          description: "Whether the action was successful",
+        },
+      },
+      required: ["success"],
+    },
+  },
+}
+
+module.exports.run = async function ({ inputs, appId }) {
+  console.log(`App ${appId} - ${inputs.text}`)
+}

packages/server/src/db/linkedRows/LinkController.js

@@ -211,14 +211,17 @@ class LinkController {
         // iterate through the link IDs in the row field, see if any don't exist already
         for (let linkId of rowField) {
           if (linkedSchema.relationshipType === RelationshipTypes.ONE_TO_MANY) {
-            const links = (
+            let links = (
               await getLinkDocuments({
                 appId: this._appId,
                 tableId: field.tableId,
                 rowId: linkId,
                 includeDocs: IncludeDocs.EXCLUDE,
               })
-            ).filter(link => link.id !== row._id)
+            ).filter(
+              link =>
+                link.id !== row._id && link.fieldName === linkedSchema.name
+            )
 
             // The 1 side of 1:N is already related to something else
             // You must remove the existing relationship

packages/worker/src/api/routes/tests/realEmail.spec.js

@@ -53,7 +53,6 @@ describe("/api/admin/email", () => {
 
   it("should be able to send a welcome email", async () => {
     await sendRealEmail(EmailTemplatePurpose.WELCOME)
-
   })
 
   it("should be able to send a invitation email", async () => {