@budibase/server 0.9.125-alpha.4 → 0.9.125-alpha.8

package/src/utilities/redis.js

@@ -2,20 +2,24 @@ const { Client, utils } = require("@budibase/auth/redis")
 const { getGlobalIDFromUserMetadataID } = require("../db/utils")
 
 const APP_DEV_LOCK_SECONDS = 600
-let devAppClient, debounceClient
+const AUTOMATION_TEST_FLAG_SECONDS = 60
+let devAppClient, debounceClient, flagClient
 
 // we init this as we want to keep the connection open all the time
 // reduces the performance hit
 exports.init = async () => {
   devAppClient = new Client(utils.Databases.DEV_LOCKS)
   debounceClient = new Client(utils.Databases.DEBOUNCE)
+  flagClient = new Client(utils.Databases.FLAGS)
   await devAppClient.init()
   await debounceClient.init()
+  await flagClient.init()
 }
 
 exports.shutdown = async () => {
   if (devAppClient) await devAppClient.finish()
   if (debounceClient) await debounceClient.finish()
+  if (flagClient) await flagClient.finish()
 }
 
 exports.doesUserHaveLock = async (devAppId, user) => {
@@ -67,3 +71,16 @@ exports.checkDebounce = async id => {
 exports.setDebounce = async (id, seconds) => {
   await debounceClient.store(id, "debouncing", seconds)
 }
+
+exports.setTestFlag = async id => {
+  await flagClient.store(id, { testing: true }, AUTOMATION_TEST_FLAG_SECONDS)
+}
+
+exports.checkTestFlag = async id => {
+  const flag = await flagClient.get(id)
+  return !!(flag && flag.testing)
+}
+
+exports.clearTestFlag = async id => {
+  await devAppClient.delete(id)
+}

package/src/utilities/rowProcessor/index.js

@@ -185,10 +185,16 @@ exports.inputProcessing = (user = {}, table, row) => {
  * @param {object} ctx the request which is looking for enriched rows.
  * @param {object} table the table from which these rows came from originally, this is used to determine
  * the schema of the rows and then enrich.
- * @param {object[]} rows the rows which are to be enriched.
- * @returns {object[]} the enriched rows will be returned.
+ * @param {object[]|object} rows the rows which are to be enriched.
+ * @param {object} opts used to set some options for the output, such as disabling relationship squashing.
+ * @returns {object[]|object} the enriched rows will be returned.
  */
-exports.outputProcessing = async (ctx, table, rows) => {
+exports.outputProcessing = async (
+  ctx,
+  table,
+  rows,
+  opts = { squash: true }
+) => {
   const appId = ctx.appId
   let wasArray = true
   if (!(rows instanceof Array)) {
@@ -214,6 +220,12 @@ exports.outputProcessing = async (ctx, table, rows) => {
       }
     }
   }
-  enriched = await linkRows.squashLinksToPrimaryDisplay(appId, table, enriched)
+  if (opts.squash) {
+    enriched = await linkRows.squashLinksToPrimaryDisplay(
+      appId,
+      table,
+      enriched
+    )
+  }
   return wasArray ? enriched : enriched[0]
 }

package/dist/automations/logic.js

@@ -1,17 +0,0 @@
-"use strict";
-let filter = require("./steps/filter");
-let delay = require("./steps/delay");
-let BUILTIN_LOGIC = {
-    DELAY: delay.run,
-    FILTER: filter.run,
-};
-let BUILTIN_DEFINITIONS = {
-    DELAY: delay.definition,
-    FILTER: filter.definition,
-};
-module.exports.getLogic = function (logicName) {
-    if (BUILTIN_LOGIC[logicName] != null) {
-        return BUILTIN_LOGIC[logicName];
-    }
-};
-module.exports.BUILTIN_DEFINITIONS = BUILTIN_DEFINITIONS;

package/dist/automations/steps/sendgridEmail.js

@@ -1,85 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-module.exports.definition = {
-    description: "Send an email using SendGrid",
-    tagline: "Send email to {{inputs.to}}",
-    icon: "ri-mail-open-line",
-    name: "Send Email (SendGrid)",
-    type: "ACTION",
-    stepId: "SEND_EMAIL",
-    inputs: {},
-    schema: {
-        inputs: {
-            properties: {
-                apiKey: {
-                    type: "string",
-                    title: "SendGrid API key",
-                },
-                to: {
-                    type: "string",
-                    title: "Send To",
-                },
-                from: {
-                    type: "string",
-                    title: "Send From",
-                },
-                subject: {
-                    type: "string",
-                    title: "Email Subject",
-                },
-                contents: {
-                    type: "string",
-                    title: "Email Contents",
-                },
-            },
-            required: ["to", "from", "subject", "contents"],
-        },
-        outputs: {
-            properties: {
-                success: {
-                    type: "boolean",
-                    description: "Whether the email was sent",
-                },
-                response: {
-                    type: "object",
-                    description: "A response from the email client, this may be an error",
-                },
-            },
-            required: ["success"],
-        },
-    },
-};
-module.exports.run = function ({ inputs }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const sgMail = require("@sendgrid/mail");
-        sgMail.setApiKey(inputs.apiKey);
-        const msg = {
-            to: inputs.to,
-            from: inputs.from,
-            subject: inputs.subject,
-            text: inputs.contents ? inputs.contents : "Empty",
-        };
-        try {
-            let response = yield sgMail.send(msg);
-            return {
-                success: true,
-                response,
-            };
-        }
-        catch (err) {
-            console.error(err);
-            return {
-                success: false,
-                response: err,
-            };
-        }
-    });
-};

package/src/automations/logic.js

@@ -1,20 +0,0 @@
-let filter = require("./steps/filter")
-let delay = require("./steps/delay")
-
-let BUILTIN_LOGIC = {
-  DELAY: delay.run,
-  FILTER: filter.run,
-}
-
-let BUILTIN_DEFINITIONS = {
-  DELAY: delay.definition,
-  FILTER: filter.definition,
-}
-
-module.exports.getLogic = function (logicName) {
-  if (BUILTIN_LOGIC[logicName] != null) {
-    return BUILTIN_LOGIC[logicName]
-  }
-}
-
-module.exports.BUILTIN_DEFINITIONS = BUILTIN_DEFINITIONS

package/src/automations/steps/sendgridEmail.js

@@ -1,74 +0,0 @@
-module.exports.definition = {
-  description: "Send an email using SendGrid",
-  tagline: "Send email to {{inputs.to}}",
-  icon: "ri-mail-open-line",
-  name: "Send Email (SendGrid)",
-  type: "ACTION",
-  stepId: "SEND_EMAIL",
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        apiKey: {
-          type: "string",
-          title: "SendGrid API key",
-        },
-        to: {
-          type: "string",
-          title: "Send To",
-        },
-        from: {
-          type: "string",
-          title: "Send From",
-        },
-        subject: {
-          type: "string",
-          title: "Email Subject",
-        },
-        contents: {
-          type: "string",
-          title: "Email Contents",
-        },
-      },
-      required: ["to", "from", "subject", "contents"],
-    },
-    outputs: {
-      properties: {
-        success: {
-          type: "boolean",
-          description: "Whether the email was sent",
-        },
-        response: {
-          type: "object",
-          description: "A response from the email client, this may be an error",
-        },
-      },
-      required: ["success"],
-    },
-  },
-}
-
-module.exports.run = async function ({ inputs }) {
-  const sgMail = require("@sendgrid/mail")
-  sgMail.setApiKey(inputs.apiKey)
-  const msg = {
-    to: inputs.to,
-    from: inputs.from,
-    subject: inputs.subject,
-    text: inputs.contents ? inputs.contents : "Empty",
-  }
-
-  try {
-    let response = await sgMail.send(msg)
-    return {
-      success: true,
-      response,
-    }
-  } catch (err) {
-    console.error(err)
-    return {
-      success: false,
-      response: err,
-    }
-  }
-}

package/src/automations/tests/sendEmail.spec.js

@@ -1,36 +0,0 @@
-const setup = require("./utilities")
-
-jest.mock("@sendgrid/mail")
-
-describe("test the send email action", () => {
-  let inputs
-  let config = setup.getConfig()
-
-  beforeEach(async () => {
-    await config.init()
-    inputs = {
-      to: "me@test.com",
-      from: "budibase@test.com",
-      subject: "Testing",
-      text: "Email contents",
-    }
-  })
-
-  afterAll(setup.afterAll)
-
-  it("should be able to run the action", async () => {
-    const res = await setup.runStep(setup.actions.SEND_EMAIL.stepId, inputs)
-    expect(res.success).toEqual(true)
-    // the mocked module throws back the input
-    expect(res.response.to).toEqual("me@test.com")
-  })
-
-  it("should return an error if input an invalid email address", async () => {
-    const res = await setup.runStep(setup.actions.SEND_EMAIL.stepId, {
-      ...inputs,
-      to: "invalid@test.com",
-    })
-    expect(res.success).toEqual(false)
-  })
-
-})