@budibase/server 2.5.6-alpha.9 → 2.5.7

package/src/automations/steps/sendSmtpEmail.ts

@@ -4,8 +4,6 @@ import {
   AutomationActionStepId,
   AutomationStepSchema,
   AutomationStepInput,
-  AutomationStepType,
-  AutomationIOType,
 } from "@budibase/types"
 
 export const definition: AutomationStepSchema = {
@@ -13,7 +11,7 @@ export const definition: AutomationStepSchema = {
   tagline: "Send SMTP email to {{inputs.to}}",
   icon: "Email",
   name: "Send Email (SMTP)",
-  type: AutomationStepType.ACTION,
+  type: "ACTION",
   internal: true,
   stepId: AutomationActionStepId.SEND_EMAIL_SMTP,
   inputs: {},
@@ -21,27 +19,27 @@ export const definition: AutomationStepSchema = {
     inputs: {
       properties: {
         to: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Send To",
         },
         from: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Send From",
         },
         cc: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "CC",
         },
         bcc: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "BCC",
         },
         subject: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Email Subject",
         },
         contents: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "HTML Contents",
         },
       },
@@ -50,11 +48,11 @@ export const definition: AutomationStepSchema = {
     outputs: {
       properties: {
         success: {
-          type: AutomationIOType.BOOLEAN,
+          type: "boolean",
           description: "Whether the email was sent",
         },
         response: {
-          type: AutomationIOType.OBJECT,
+          type: "object",
           description: "A response from the email client, this may be an error",
         },
       },

package/src/automations/steps/serverLog.ts

@@ -2,8 +2,6 @@ import {
   AutomationActionStepId,
   AutomationStepSchema,
   AutomationStepInput,
-  AutomationStepType,
-  AutomationIOType,
 } from "@budibase/types"
 
 /**
@@ -17,7 +15,7 @@ export const definition: AutomationStepSchema = {
   tagline: "Console log a value in the backend",
   icon: "Monitoring",
   description: "Logs the given text to the server (using console.log)",
-  type: AutomationStepType.ACTION,
+  type: "ACTION",
   internal: true,
   stepId: AutomationActionStepId.SERVER_LOG,
   inputs: {
@@ -27,7 +25,7 @@ export const definition: AutomationStepSchema = {
     inputs: {
       properties: {
         text: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Log",
         },
       },
@@ -36,11 +34,11 @@ export const definition: AutomationStepSchema = {
     outputs: {
       properties: {
         success: {
-          type: AutomationIOType.BOOLEAN,
+          type: "boolean",
           description: "Whether the action was successful",
         },
         message: {
-          type: AutomationIOType.STRING,
+          type: "string",
           description: "What was output",
         },
       },

package/src/automations/steps/slack.ts

@@ -4,8 +4,6 @@ import {
   AutomationActionStepId,
   AutomationStepSchema,
   AutomationStepInput,
-  AutomationStepType,
-  AutomationIOType,
 } from "@budibase/types"
 
 export const definition: AutomationStepSchema = {
@@ -14,18 +12,18 @@ export const definition: AutomationStepSchema = {
   description: "Send a message to Slack",
   icon: "ri-slack-line",
   stepId: AutomationActionStepId.slack,
-  type: AutomationStepType.ACTION,
+  type: "ACTION",
   internal: false,
   inputs: {},
   schema: {
     inputs: {
       properties: {
         url: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Incoming Webhook URL",
         },
         text: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Message",
         },
       },
@@ -34,15 +32,15 @@ export const definition: AutomationStepSchema = {
     outputs: {
       properties: {
         httpStatus: {
-          type: AutomationIOType.NUMBER,
+          type: "number",
           description: "The HTTP status code of the request",
         },
         success: {
-          type: AutomationIOType.BOOLEAN,
+          type: "boolean",
           description: "Whether the message sent successfully",
         },
         response: {
-          type: AutomationIOType.STRING,
+          type: "string",
           description: "The response from the Slack Webhook",
         },
       },

package/src/automations/steps/updateRow.ts

@@ -3,11 +3,8 @@ import * as automationUtils from "../automationUtils"
 import { buildCtx } from "./utils"
 import {
   AutomationActionStepId,
-  AutomationCustomIOType,
-  AutomationIOType,
-  AutomationStepInput,
   AutomationStepSchema,
-  AutomationStepType,
+  AutomationStepInput,
 } from "@budibase/types"
 
 export const definition: AutomationStepSchema = {
@@ -15,7 +12,7 @@ export const definition: AutomationStepSchema = {
   tagline: "Update a {{inputs.enriched.table.name}} row",
   icon: "Refresh",
   description: "Update a row in your database",
-  type: AutomationStepType.ACTION,
+  type: "ACTION",
   internal: true,
   stepId: AutomationActionStepId.UPDATE_ROW,
   inputs: {},
@@ -23,16 +20,16 @@ export const definition: AutomationStepSchema = {
     inputs: {
       properties: {
         meta: {
-          type: AutomationIOType.OBJECT,
+          type: "object",
           title: "Field settings",
         },
         row: {
-          type: AutomationIOType.OBJECT,
-          customType: AutomationCustomIOType.ROW,
+          type: "object",
+          customType: "row",
           title: "Table",
         },
         rowId: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Row ID",
         },
       },
@@ -41,24 +38,24 @@ export const definition: AutomationStepSchema = {
     outputs: {
       properties: {
         row: {
-          type: AutomationIOType.OBJECT,
-          customType: AutomationCustomIOType.ROW,
+          type: "object",
+          customType: "row",
           description: "The updated row",
         },
         response: {
-          type: AutomationIOType.OBJECT,
+          type: "object",
           description: "The response from the table",
         },
         success: {
-          type: AutomationIOType.BOOLEAN,
+          type: "boolean",
           description: "Whether the action was successful",
         },
         id: {
-          type: AutomationIOType.STRING,
+          type: "string",
           description: "The identifier of the updated row",
         },
         revision: {
-          type: AutomationIOType.STRING,
+          type: "string",
           description: "The revision of the updated row",
         },
       },

package/src/automations/steps/zapier.ts

@@ -4,14 +4,12 @@ import {
   AutomationActionStepId,
   AutomationStepSchema,
   AutomationStepInput,
-  AutomationStepType,
-  AutomationIOType,
 } from "@budibase/types"
 
 export const definition: AutomationStepSchema = {
   name: "Zapier Webhook",
   stepId: AutomationActionStepId.zapier,
-  type: AutomationStepType.ACTION,
+  type: "ACTION",
   internal: false,
   description: "Trigger a Zapier Zap via webhooks",
   tagline: "Trigger a Zapier Zap",
@@ -21,27 +19,27 @@ export const definition: AutomationStepSchema = {
     inputs: {
       properties: {
         url: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Webhook URL",
         },
         value1: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Payload Value 1",
         },
         value2: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Payload Value 2",
         },
         value3: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Payload Value 3",
         },
         value4: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Payload Value 4",
         },
         value5: {
-          type: AutomationIOType.STRING,
+          type: "string",
           title: "Payload Value 5",
         },
       },
@@ -50,11 +48,11 @@ export const definition: AutomationStepSchema = {
     outputs: {
       properties: {
         httpStatus: {
-          type: AutomationIOType.NUMBER,
+          type: "number",
           description: "The HTTP status code of the request",
         },
         response: {
-          type: AutomationIOType.STRING,
+          type: "string",
           description: "The response from Zapier",
         },
       },

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

@@ -1,6 +1,6 @@
 import TestConfig from "../../../tests/utilities/TestConfiguration"
 import { context } from "@budibase/backend-core"
-import { BUILTIN_ACTION_DEFINITIONS, getAction } from "../../actions"
+import { ACTION_DEFINITIONS, getAction } from "../../actions"
 import emitter from "../../../events/index"
 import env from "../../../environment"
 
@@ -57,4 +57,4 @@ export async function runStep(stepId: string, inputs: any, stepContext?: any) {
 }
 
 export const apiKey = "test"
-export const actions = BUILTIN_ACTION_DEFINITIONS
+export const actions = ACTION_DEFINITIONS

package/src/automations/triggerInfo/app.ts

@@ -1,7 +1,4 @@
 import {
-  AutomationCustomIOType,
-  AutomationIOType,
-  AutomationStepType,
   AutomationTriggerSchema,
   AutomationTriggerStepId,
 } from "@budibase/types"
@@ -18,8 +15,8 @@ export const definition: AutomationTriggerSchema = {
     inputs: {
       properties: {
         fields: {
-          type: AutomationIOType.OBJECT,
-          customType: AutomationCustomIOType.TRIGGER_SCHEMA,
+          type: "object",
+          customType: "triggerSchema",
           title: "Fields",
         },
       },
@@ -28,13 +25,13 @@ export const definition: AutomationTriggerSchema = {
     outputs: {
       properties: {
         fields: {
-          type: AutomationIOType.OBJECT,
+          type: "object",
           description: "Fields submitted from the app frontend",
-          customType: AutomationCustomIOType.TRIGGER_SCHEMA,
+          customType: "triggerSchema",
         },
       },
       required: ["fields"],
     },
   },
-  type: AutomationStepType.TRIGGER,
+  type: "TRIGGER",
 }

package/src/automations/triggerInfo/cron.ts

@@ -1,7 +1,4 @@
 import {
-  AutomationCustomIOType,
-  AutomationIOType,
-  AutomationStepType,
   AutomationTriggerSchema,
   AutomationTriggerStepId,
 } from "@budibase/types"
@@ -18,8 +15,8 @@ export const definition: AutomationTriggerSchema = {
     inputs: {
       properties: {
         cron: {
-          type: AutomationIOType.STRING,
-          customType: AutomationCustomIOType.CRON,
+          type: "string",
+          customType: "cron",
           title: "Expression",
         },
       },
@@ -28,12 +25,12 @@ export const definition: AutomationTriggerSchema = {
     outputs: {
       properties: {
         timestamp: {
-          type: AutomationIOType.NUMBER,
+          type: "number",
           description: "Timestamp the cron was executed",
         },
       },
       required: ["timestamp"],
     },
   },
-  type: AutomationStepType.TRIGGER,
+  type: "TRIGGER",
 }

package/src/automations/triggerInfo/rowDeleted.ts

@@ -1,7 +1,4 @@
 import {
-  AutomationCustomIOType,
-  AutomationIOType,
-  AutomationStepType,
   AutomationTriggerSchema,
   AutomationTriggerStepId,
 } from "@budibase/types"
@@ -18,8 +15,8 @@ export const definition: AutomationTriggerSchema = {
     inputs: {
       properties: {
         tableId: {
-          type: AutomationIOType.STRING,
-          customType: AutomationCustomIOType.TABLE,
+          type: "string",
+          customType: "table",
           title: "Table",
         },
       },
@@ -28,13 +25,13 @@ export const definition: AutomationTriggerSchema = {
     outputs: {
       properties: {
         row: {
-          type: AutomationIOType.OBJECT,
-          customType: AutomationCustomIOType.ROW,
+          type: "object",
+          customType: "row",
           description: "The row that was deleted",
         },
       },
       required: ["row"],
     },
   },
-  type: AutomationStepType.TRIGGER,
+  type: "TRIGGER",
 }

package/src/automations/triggerInfo/rowSaved.ts

@@ -1,7 +1,4 @@
 import {
-  AutomationCustomIOType,
-  AutomationIOType,
-  AutomationStepType,
   AutomationTriggerSchema,
   AutomationTriggerStepId,
 } from "@budibase/types"
@@ -18,8 +15,8 @@ export const definition: AutomationTriggerSchema = {
     inputs: {
       properties: {
         tableId: {
-          type: AutomationIOType.STRING,
-          customType: AutomationCustomIOType.TABLE,
+          type: "string",
+          customType: "table",
           title: "Table",
         },
       },
@@ -28,21 +25,21 @@ export const definition: AutomationTriggerSchema = {
     outputs: {
       properties: {
         row: {
-          type: AutomationIOType.OBJECT,
-          customType: AutomationCustomIOType.ROW,
+          type: "object",
+          customType: "row",
           description: "The new row that was created",
         },
         id: {
-          type: AutomationIOType.STRING,
+          type: "string",
           description: "Row ID - can be used for updating",
         },
         revision: {
-          type: AutomationIOType.STRING,
+          type: "string",
           description: "Revision of row",
         },
       },
       required: ["row", "id"],
     },
   },
-  type: AutomationStepType.TRIGGER,
+  type: "TRIGGER",
 }

package/src/automations/triggerInfo/rowUpdated.ts

@@ -1,7 +1,4 @@
 import {
-  AutomationCustomIOType,
-  AutomationIOType,
-  AutomationStepType,
   AutomationTriggerSchema,
   AutomationTriggerStepId,
 } from "@budibase/types"
@@ -18,8 +15,8 @@ export const definition: AutomationTriggerSchema = {
     inputs: {
       properties: {
         tableId: {
-          type: AutomationIOType.STRING,
-          customType: AutomationCustomIOType.TABLE,
+          type: "string",
+          customType: "table",
           title: "Table",
         },
       },
@@ -28,21 +25,21 @@ export const definition: AutomationTriggerSchema = {
     outputs: {
       properties: {
         row: {
-          type: AutomationIOType.OBJECT,
-          customType: AutomationCustomIOType.ROW,
+          type: "object",
+          customType: "row",
           description: "The row that was updated",
         },
         id: {
-          type: AutomationIOType.STRING,
+          type: "string",
           description: "Row ID - can be used for updating",
         },
         revision: {
-          type: AutomationIOType.STRING,
+          type: "string",
           description: "Revision of row",
         },
       },
       required: ["row", "id"],
     },
   },
-  type: AutomationStepType.TRIGGER,
+  type: "TRIGGER",
 }

package/src/automations/triggerInfo/webhook.ts

@@ -1,7 +1,4 @@
 import {
-  AutomationCustomIOType,
-  AutomationIOType,
-  AutomationStepType,
   AutomationTriggerSchema,
   AutomationTriggerStepId,
 } from "@budibase/types"
@@ -18,13 +15,13 @@ export const definition: AutomationTriggerSchema = {
     inputs: {
       properties: {
         schemaUrl: {
-          type: AutomationIOType.STRING,
-          customType: AutomationCustomIOType.WEBHOOK_URL,
+          type: "string",
+          customType: "webhookUrl",
           title: "Schema URL",
         },
         triggerUrl: {
-          type: AutomationIOType.STRING,
-          customType: AutomationCustomIOType.WEBHOOK_URL,
+          type: "string",
+          customType: "webhookUrl",
           title: "Trigger URL",
         },
       },
@@ -33,12 +30,12 @@ export const definition: AutomationTriggerSchema = {
     outputs: {
       properties: {
         body: {
-          type: AutomationIOType.OBJECT,
+          type: "object",
           description: "Body of the request which hit the webhook",
         },
       },
       required: ["body"],
     },
   },
-  type: AutomationStepType.TRIGGER,
+  type: "TRIGGER",
 }

package/src/elasticApm.ts

@@ -0,0 +1,10 @@
+import apm from "elastic-apm-node"
+
+// enable APM if configured
+if (process.env.ELASTIC_APM_ENABLED) {
+  console.log("Starting elastic-apm-node")
+  apm.start({
+    serviceName: process.env.SERVICE,
+    environment: process.env.BUDIBASE_ENVIRONMENT,
+  })
+}

package/src/environment.ts

@@ -62,6 +62,7 @@ const environment = {
   // minor
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   LOGGER: process.env.LOGGER,
+  LOG_LEVEL: process.env.LOG_LEVEL,
   ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
   AUTOMATION_MAX_ITERATIONS:
     parseIntSafe(process.env.AUTOMATION_MAX_ITERATIONS) || 200,

package/src/events/index.ts

@@ -2,5 +2,4 @@ import BudibaseEmitter from "./BudibaseEmitter"
 
 const emitter = new BudibaseEmitter()
 
-export { init } from "./docUpdates"
 export default emitter

package/src/integrations/index.ts

@@ -14,11 +14,11 @@ import firebase from "./firebase"
 import redis from "./redis"
 import snowflake from "./snowflake"
 import oracle from "./oracle"
+import { getPlugins } from "../api/controllers/plugin"
 import { SourceName, Integration, PluginType } from "@budibase/types"
 import { getDatasourcePlugin } from "../utilities/fileSystem"
 import env from "../environment"
 import { cloneDeep } from "lodash"
-import sdk from "../sdk"
 
 const DEFINITIONS: { [key: string]: Integration } = {
   [SourceName.POSTGRES]: postgres.schema,
@@ -79,7 +79,7 @@ export async function getDefinition(source: SourceName): Promise<Integration> {
 export async function getDefinitions() {
   const pluginSchemas: { [key: string]: Integration } = {}
   if (env.SELF_HOSTED) {
-    const plugins = await sdk.plugins.fetch(PluginType.DATASOURCE)
+    const plugins = await getPlugins(PluginType.DATASOURCE)
     // extract the actual schema from each custom
     for (let plugin of plugins) {
       const sourceId = plugin.name
@@ -103,7 +103,7 @@ export async function getIntegration(integration: string) {
     return INTEGRATIONS[integration]
   }
   if (env.SELF_HOSTED) {
-    const plugins = await sdk.plugins.fetch(PluginType.DATASOURCE)
+    const plugins = await getPlugins(PluginType.DATASOURCE)
     for (let plugin of plugins) {
       if (plugin.name === integration) {
         // need to use commonJS require due to its dynamic runtime nature

package/src/integrations/microsoftSqlServer.ts

@@ -243,14 +243,11 @@ class SqlServerIntegration extends Sql implements DatasourcePlus {
         if (typeof name !== "string") {
           continue
         }
-        const hasDefault = def.COLUMN_DEFAULT
-        const isAuto = !!autoColumns.find(col => col === name)
-        const required = !!requiredColumns.find(col => col === name)
         schema[name] = {
-          autocolumn: isAuto,
+          autocolumn: !!autoColumns.find(col => col === name),
           name: name,
           constraints: {
-            presence: required && !isAuto && !hasDefault,
+            presence: requiredColumns.find(col => col === name),
           },
           ...convertSqlType(def.DATA_TYPE),
           externalType: def.DATA_TYPE,

package/src/integrations/mysql.ts

@@ -229,15 +229,13 @@ class MySQLIntegration extends Sql implements DatasourcePlus {
           if (column.Key === "PRI" && primaryKeys.indexOf(column.Key) === -1) {
             primaryKeys.push(columnName)
           }
-          const hasDefault = column.Default != null
+          const constraints = {
+            presence: column.Null !== "YES",
+          }
           const isAuto: boolean =
             typeof column.Extra === "string" &&
             (column.Extra === "auto_increment" ||
               column.Extra.toLowerCase().includes("generated"))
-          const required = column.Null !== "YES"
-          const constraints = {
-            presence: required && !isAuto && !hasDefault,
-          }
           schema[columnName] = {
             name: columnName,
             autocolumn: isAuto,

package/src/integrations/postgres.ts

@@ -262,17 +262,15 @@ class PostgresIntegration extends Sql implements DatasourcePlus {
           column.identity_start ||
           column.identity_increment
         )
-        const hasDefault = column.column_default != null
-        const hasNextVal =
+        const constraints = {
+          presence: column.is_nullable === "NO",
+        }
+        const hasDefault =
           typeof column.column_default === "string" &&
           column.column_default.startsWith("nextval")
         const isGenerated =
           column.is_generated && column.is_generated !== "NEVER"
-        const isAuto: boolean = hasNextVal || identity || isGenerated
-        const required = column.is_nullable === "NO"
-        const constraints = {
-          presence: required && !hasDefault && !isGenerated,
-        }
+        const isAuto: boolean = hasDefault || identity || isGenerated
         tables[tableName].schema[columnName] = {
           autocolumn: isAuto,
           name: columnName,