@budibase/server 2.1.43-alpha.1 → 2.1.43

package/src/automations/steps/{queryRows.ts → queryRows.js}

@@ -1,43 +1,36 @@
-import * as rowController from "../../api/controllers/row"
-import * as tableController from "../../api/controllers/table"
-import { FieldTypes } from "../../constants"
-import { buildCtx } from "./utils"
-import * as automationUtils from "../automationUtils"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-  SearchFilters,
-  Table,
-} from "@budibase/types"
+const rowController = require("../../api/controllers/row")
+const tableController = require("../../api/controllers/table")
+const { FieldTypes } = require("../../constants")
+const { buildCtx } = require("./utils")
+const automationUtils = require("../automationUtils")
 
-enum SortOrder {
-  ASCENDING = "ascending",
-  DESCENDING = "descending",
+const SortOrders = {
+  ASCENDING: "ascending",
+  DESCENDING: "descending",
 }
 
-const SortOrderPretty = {
-  [SortOrder.ASCENDING]: "Ascending",
-  [SortOrder.DESCENDING]: "Descending",
+const SortOrdersPretty = {
+  [SortOrders.ASCENDING]: "Ascending",
+  [SortOrders.DESCENDING]: "Descending",
 }
 
-enum EmptyFilterOption {
-  RETURN_ALL = "all",
-  RETURN_NONE = "none",
+const EmptyFilterOptions = {
+  RETURN_ALL: "all",
+  RETURN_NONE: "none",
 }
 
-const EmptyFilterOptionPretty = {
-  [EmptyFilterOption.RETURN_ALL]: "Return all table rows",
-  [EmptyFilterOption.RETURN_NONE]: "Return no rows",
+const EmptyFilterOptionsPretty = {
+  [EmptyFilterOptions.RETURN_ALL]: "Return all table rows",
+  [EmptyFilterOptions.RETURN_NONE]: "Return no rows",
 }
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   description: "Query rows from the database",
   icon: "Search",
   name: "Query rows",
   tagline: "Query rows from {{inputs.enriched.table.name}} table",
   type: "ACTION",
-  stepId: AutomationActionStepId.QUERY_ROWS,
+  stepId: "QUERY_ROWS",
   internal: true,
   inputs: {},
   schema: {
@@ -61,8 +54,8 @@ export const definition: AutomationStepSchema = {
         sortOrder: {
           type: "string",
           title: "Sort Order",
-          enum: Object.values(SortOrder),
-          pretty: Object.values(SortOrderPretty),
+          enum: Object.values(SortOrders),
+          pretty: Object.values(SortOrdersPretty),
         },
         limit: {
           type: "number",
@@ -70,8 +63,8 @@ export const definition: AutomationStepSchema = {
           customType: "queryLimit",
         },
         onEmptyFilter: {
-          pretty: Object.values(EmptyFilterOptionPretty),
-          enum: Object.values(EmptyFilterOption),
+          pretty: Object.values(EmptyFilterOptionsPretty),
+          enum: Object.values(EmptyFilterOptions),
           type: "string",
           title: "When Filter Empty",
         },
@@ -95,8 +88,8 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-async function getTable(appId: string, tableId: string) {
-  const ctx: any = buildCtx(appId, null, {
+async function getTable(appId, tableId) {
+  const ctx = buildCtx(appId, null, {
     params: {
       tableId,
     },
@@ -105,22 +98,20 @@ async function getTable(appId: string, tableId: string) {
   return ctx.body
 }
 
-function typeCoercion(filters: SearchFilters, table: Table) {
+function typeCoercion(filters, table) {
   if (!filters || !table) {
     return filters
   }
   for (let key of Object.keys(filters)) {
-    // @ts-ignore
-    const searchParam = filters[key]
-    if (typeof searchParam === "object") {
-      for (let [property, value] of Object.entries(searchParam)) {
+    if (typeof filters[key] === "object") {
+      for (let [property, value] of Object.entries(filters[key])) {
         const column = table.schema[property]
         // convert string inputs
         if (!column || typeof value !== "string") {
           continue
         }
         if (column.type === FieldTypes.NUMBER) {
-          searchParam[property] = parseFloat(value)
+          filters[key][property] = parseFloat(value)
         }
       }
     }
@@ -128,14 +119,11 @@ function typeCoercion(filters: SearchFilters, table: Table) {
   return filters
 }
 
-function hasNullFilters(filters: any[]) {
-  return (
-    filters.length === 0 ||
-    filters.some(filter => filter.value === null || filter.value === "")
-  )
-}
+const hasNullFilters = filters =>
+  filters.length === 0 ||
+  filters.some(filter => filter.value === null || filter.value === "")
 
-export async function run({ inputs, appId }: AutomationStepInput) {
+exports.run = async function ({ inputs, appId }) {
   const { tableId, filters, sortColumn, sortOrder, limit } = inputs
   if (!tableId) {
     return {
@@ -152,7 +140,7 @@ export async function run({ inputs, appId }: AutomationStepInput) {
     sortType =
       fieldType === FieldTypes.NUMBER ? FieldTypes.NUMBER : FieldTypes.STRING
   }
-  const ctx: any = buildCtx(appId, null, {
+  const ctx = buildCtx(appId, null, {
     params: {
       tableId,
     },
@@ -162,7 +150,7 @@ export async function run({ inputs, appId }: AutomationStepInput) {
       sort: sortColumn,
       query: typeCoercion(filters || {}, table),
       // default to ascending, like data tab
-      sortOrder: sortOrder || SortOrder.ASCENDING,
+      sortOrder: sortOrder || SortOrders.ASCENDING,
     },
     version: "1",
   })
@@ -170,7 +158,7 @@ export async function run({ inputs, appId }: AutomationStepInput) {
     let rows
 
     if (
-      inputs.onEmptyFilter === EmptyFilterOption.RETURN_NONE &&
+      inputs.onEmptyFilter === EmptyFilterOptions.RETURN_NONE &&
       inputs["filters-def"] &&
       hasNullFilters(inputs["filters-def"])
     ) {

package/src/automations/steps/{sendSmtpEmail.ts → sendSmtpEmail.js}

@@ -1,19 +1,14 @@
-import { sendSmtpEmail } from "../../utilities/workerRequests"
-import * as automationUtils from "../automationUtils"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
+const { sendSmtpEmail } = require("../../utilities/workerRequests")
+const automationUtils = require("../automationUtils")
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   description: "Send an email using SMTP",
   tagline: "Send SMTP email to {{inputs.to}}",
   icon: "Email",
   name: "Send Email (SMTP)",
   type: "ACTION",
   internal: true,
-  stepId: AutomationActionStepId.SEND_EMAIL_SMTP,
+  stepId: "SEND_EMAIL_SMTP",
   inputs: {},
   schema: {
     inputs: {
@@ -61,7 +56,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs }: AutomationStepInput) {
+exports.run = async function ({ inputs }) {
   let { to, from, subject, contents, cc, bcc } = inputs
   if (!contents) {
     contents = "<h1>No content</h1>"

package/src/automations/steps/{serverLog.ts → serverLog.js}

@@ -1,23 +1,17 @@
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
-
 /**
  * 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.
  */
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   name: "Backend log",
   tagline: "Console log a value in the backend",
   icon: "Monitoring",
   description: "Logs the given text to the server (using console.log)",
   type: "ACTION",
   internal: true,
-  stepId: AutomationActionStepId.SERVER_LOG,
+  stepId: "SERVER_LOG",
   inputs: {
     text: "",
   },
@@ -47,7 +41,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs, appId }: AutomationStepInput) {
+exports.run = async function ({ inputs, appId }) {
   const message = `App ${appId} - ${inputs.text}`
   console.log(message)
   return {

package/src/automations/steps/{slack.ts → slack.js}

@@ -1,17 +1,12 @@
-import fetch from "node-fetch"
-import { getFetchResponse } from "./utils"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
+const fetch = require("node-fetch")
+const { getFetchResponse } = require("./utils")
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   name: "Slack Message",
   tagline: "Send a message to Slack",
   description: "Send a message to Slack",
   icon: "ri-slack-line",
-  stepId: AutomationActionStepId.slack,
+  stepId: "slack",
   type: "ACTION",
   internal: false,
   inputs: {},
@@ -48,7 +43,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs }: AutomationStepInput) {
+exports.run = async function ({ inputs }) {
   let { url, text } = inputs
   const response = await fetch(url, {
     method: "post",

package/src/automations/steps/{updateRow.ts → updateRow.js}

@@ -1,20 +1,15 @@
-import * as rowController from "../../api/controllers/row"
-import * as automationUtils from "../automationUtils"
-import { buildCtx } from "./utils"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
+const rowController = require("../../api/controllers/row")
+const automationUtils = require("../automationUtils")
+const { buildCtx } = require("./utils")
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   name: "Update Row",
   tagline: "Update a {{inputs.enriched.table.name}} row",
   icon: "Refresh",
   description: "Update a row in your database",
   type: "ACTION",
   internal: true,
-  stepId: AutomationActionStepId.UPDATE_ROW,
+  stepId: "UPDATE_ROW",
   inputs: {},
   schema: {
     inputs: {
@@ -60,7 +55,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs, appId, emitter }: AutomationStepInput) {
+exports.run = async function ({ inputs, appId, emitter }) {
   if (inputs.rowId == null || inputs.row == null) {
     return {
       success: false,
@@ -79,7 +74,7 @@ export async function run({ inputs, appId, emitter }: AutomationStepInput) {
   }
 
   // have to clean up the row, remove the table from it
-  const ctx: any = buildCtx(appId, emitter, {
+  const ctx = buildCtx(appId, emitter, {
     body: {
       ...inputs.row,
       _id: inputs.rowId,

package/src/automations/steps/{utils.ts → utils.js}

@@ -1,6 +1,4 @@
-import { EventEmitter } from "events"
-
-export async function getFetchResponse(fetched: any) {
+exports.getFetchResponse = async fetched => {
   let status = fetched.status,
     message
   const contentType = fetched.headers.get("content-type")
@@ -20,16 +18,12 @@ export async function getFetchResponse(fetched: any) {
 // throw added to them, so that controllers don't
 // throw a ctx.throw undefined when error occurs
 // opts can contain, body, params and version
-export function buildCtx(
-  appId: string,
-  emitter?: EventEmitter | null,
-  opts: any = {}
-) {
-  const ctx: any = {
+exports.buildCtx = (appId, emitter, opts = {}) => {
+  const ctx = {
     appId,
     user: { appId },
     eventEmitter: emitter,
-    throw: (code: string, error: any) => {
+    throw: (code, error) => {
       throw error
     },
   }

package/src/automations/steps/{zapier.ts → zapier.js}

@@ -1,20 +1,14 @@
-import fetch from "node-fetch"
-import { getFetchResponse } from "./utils"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
+const fetch = require("node-fetch")
+const { getFetchResponse } = require("./utils")
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   name: "Zapier Webhook",
-  stepId: AutomationActionStepId.zapier,
+  stepId: "zapier",
   type: "ACTION",
   internal: false,
   description: "Trigger a Zapier Zap via webhooks",
   tagline: "Trigger a Zapier Zap",
   icon: "ri-flashlight-line",
-  inputs: {},
   schema: {
     inputs: {
       properties: {
@@ -60,7 +54,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs }: AutomationStepInput) {
+exports.run = async function ({ inputs }) {
   const { url, value1, value2, value3, value4, value5 } = inputs
 
   // send the platform to make sure zaps always work, even

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

@@ -1,3 +1,4 @@
+const env = require("../../environment")
 const setup = require("./utilities")
 
 describe("test the update row action", () => {

package/src/automations/tests/utilities/index.js

@@ -0,0 +1,51 @@
+const TestConfig = require("../../../tests/utilities/TestConfiguration")
+const { TENANT_ID } = require("../../../tests/utilities/structures")
+const { doInTenant } = require("@budibase/backend-core/tenancy")
+const actions = require("../../actions")
+const emitter = require("../../../events/index")
+const env = require("../../../environment")
+
+let config
+
+exports.getConfig = () => {
+  if (!config) {
+    config = new TestConfig(false)
+  }
+  return config
+}
+
+exports.afterAll = () => {
+  config.end()
+}
+
+exports.runInProd = async fn => {
+  env._set("NODE_ENV", "production")
+  let error
+  try {
+    await fn()
+  } catch (err) {
+    error = err
+  }
+  env._set("NODE_ENV", "jest")
+  if (error) {
+    throw error
+  }
+}
+
+exports.runStep = async function runStep(stepId, inputs) {
+  return doInTenant(TENANT_ID, async () => {
+    let step = await actions.getAction(stepId)
+    expect(step).toBeDefined()
+    return step({
+      inputs,
+      appId: config ? config.getAppId() : null,
+      // don't really need an API key, mocked out usage quota, not being tested here
+      apiKey: exports.apiKey,
+      emitter,
+    })
+  })
+}
+
+exports.apiKey = "test"
+
+exports.actions = actions.ACTION_DEFINITIONS

package/src/automations/triggerInfo/{app.ts → app.js}

@@ -1,15 +1,10 @@
-import {
-  AutomationTriggerSchema,
-  AutomationTriggerStepId,
-} from "@budibase/types"
-
-export const definition: AutomationTriggerSchema = {
+exports.definition = {
   name: "App Action",
   event: "app:trigger",
   icon: "Apps",
   tagline: "Automation fired from the frontend",
   description: "Trigger an automation from an action inside your app",
-  stepId: AutomationTriggerStepId.APP,
+  stepId: "APP",
   inputs: {},
   schema: {
     inputs: {

package/src/automations/triggerInfo/{cron.ts → cron.js}

@@ -1,15 +1,10 @@
-import {
-  AutomationTriggerSchema,
-  AutomationTriggerStepId,
-} from "@budibase/types"
-
-export const definition: AutomationTriggerSchema = {
+exports.definition = {
   name: "Cron Trigger",
   event: "cron:trigger",
   icon: "Clock",
   tagline: "Cron Trigger (<b>{{inputs.cron}}</b>)",
   description: "Triggers automation on a cron schedule.",
-  stepId: AutomationTriggerStepId.CRON,
+  stepId: "CRON",
   inputs: {},
   schema: {
     inputs: {

package/src/automations/triggerInfo/index.js

@@ -0,0 +1,15 @@
+const app = require("./app")
+const cron = require("./cron")
+const rowDeleted = require("./rowDeleted")
+const rowSaved = require("./rowSaved")
+const rowUpdated = require("./rowUpdated")
+const webhook = require("./webhook")
+
+exports.definitions = {
+  ROW_SAVED: rowSaved.definition,
+  ROW_UPDATED: rowUpdated.definition,
+  ROW_DELETED: rowDeleted.definition,
+  WEBHOOK: webhook.definition,
+  APP: app.definition,
+  CRON: cron.definition,
+}

package/src/automations/triggerInfo/{rowDeleted.ts → rowDeleted.js}

@@ -1,15 +1,10 @@
-import {
-  AutomationTriggerSchema,
-  AutomationTriggerStepId,
-} from "@budibase/types"
-
-export const definition: AutomationTriggerSchema = {
+exports.definition = {
   name: "Row Deleted",
   event: "row:delete",
   icon: "TableRowRemoveCenter",
   tagline: "Row is deleted from {{inputs.enriched.table.name}}",
   description: "Fired when a row is deleted from your database",
-  stepId: AutomationTriggerStepId.ROW_DELETED,
+  stepId: "ROW_DELETED",
   inputs: {},
   schema: {
     inputs: {

package/src/automations/triggerInfo/{rowSaved.ts → rowSaved.js}

@@ -1,15 +1,10 @@
-import {
-  AutomationTriggerSchema,
-  AutomationTriggerStepId,
-} from "@budibase/types"
-
-export const definition: AutomationTriggerSchema = {
+exports.definition = {
   name: "Row Created",
   event: "row:save",
   icon: "TableRowAddBottom",
   tagline: "Row is added to {{inputs.enriched.table.name}}",
   description: "Fired when a row is added to your database",
-  stepId: AutomationTriggerStepId.ROW_SAVED,
+  stepId: "ROW_SAVED",
   inputs: {},
   schema: {
     inputs: {

package/src/automations/triggerInfo/{rowUpdated.ts → rowUpdated.js}

@@ -1,15 +1,10 @@
-import {
-  AutomationTriggerSchema,
-  AutomationTriggerStepId,
-} from "@budibase/types"
-
-export const definition: AutomationTriggerSchema = {
+exports.definition = {
   name: "Row Updated",
   event: "row:update",
   icon: "Refresh",
   tagline: "Row is updated in {{inputs.enriched.table.name}}",
   description: "Fired when a row is updated in your database",
-  stepId: AutomationTriggerStepId.ROW_UPDATED,
+  stepId: "ROW_UPDATED",
   inputs: {},
   schema: {
     inputs: {

package/src/automations/triggerInfo/{webhook.ts → webhook.js}

@@ -1,15 +1,10 @@
-import {
-  AutomationTriggerSchema,
-  AutomationTriggerStepId,
-} from "@budibase/types"
-
-export const definition: AutomationTriggerSchema = {
+exports.definition = {
   name: "Webhook",
   event: "web:trigger",
   icon: "Send",
   tagline: "Webhook endpoint is hit",
   description: "Trigger an automation when a HTTP POST webhook is hit",
-  stepId: AutomationTriggerStepId.WEBHOOK,
+  stepId: "WEBHOOK",
   inputs: {},
   schema: {
     inputs: {