@budibase/server 1.0.219-alpha.7 → 1.0.219

package/src/automations/steps/filter.js

@@ -50,51 +50,43 @@ exports.definition = {
     outputs: {
       properties: {
         success: {
-          type: "boolean",
-          description: "Whether the action was successful",
-        },
-        result: {
           type: "boolean",
           description: "Whether the logic block passed",
         },
       },
-      required: ["success", "result"],
+      required: ["success"],
     },
   },
 }
 
 exports.run = async function filter({ inputs }) {
-  try {
-    let { field, condition, value } = inputs
-    // coerce types so that we can use them
-    if (!isNaN(value) && !isNaN(field)) {
-      value = parseFloat(value)
-      field = parseFloat(field)
-    } else if (!isNaN(Date.parse(value)) && !isNaN(Date.parse(field))) {
-      value = Date.parse(value)
-      field = Date.parse(field)
-    }
-    let result = false
-    if (typeof field !== "object" && typeof value !== "object") {
-      switch (condition) {
-        case FilterConditions.EQUAL:
-          result = field === value
-          break
-        case FilterConditions.NOT_EQUAL:
-          result = field !== value
-          break
-        case FilterConditions.GREATER_THAN:
-          result = field > value
-          break
-        case FilterConditions.LESS_THAN:
-          result = field < value
-          break
-      }
-    } else {
-      result = false
+  let { field, condition, value } = inputs
+  // coerce types so that we can use them
+  if (!isNaN(value) && !isNaN(field)) {
+    value = parseFloat(value)
+    field = parseFloat(field)
+  } else if (!isNaN(Date.parse(value)) && !isNaN(Date.parse(field))) {
+    value = Date.parse(value)
+    field = Date.parse(field)
+  }
+  let success = false
+  if (typeof field !== "object" && typeof value !== "object") {
+    switch (condition) {
+      case FilterConditions.EQUAL:
+        success = field === value
+        break
+      case FilterConditions.NOT_EQUAL:
+        success = field !== value
+        break
+      case FilterConditions.GREATER_THAN:
+        success = field > value
+        break
+      case FilterConditions.LESS_THAN:
+        success = field < value
+        break
     }
-    return { success: true, result }
-  } catch (err) {
-    return { success: false, result: false }
+  } else {
+    success = false
   }
+  return { success }
 }

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

@@ -6,8 +6,7 @@ describe("test the filter logic", () => {
     let res = await setup.runStep(setup.actions.FILTER.stepId,
       { field, condition, value }
     )
-    expect(res.result).toEqual(pass)
-    expect(res.success).toEqual(true)
+    expect(res.success).toEqual(pass)
   }
 
   it("should be able test equality", async () => {

package/src/automations/triggers.js

@@ -97,7 +97,7 @@ exports.externalTrigger = async function (
     // values are likely to be submitted as strings, so we shall convert to correct type
     const coercedFields = {}
     const fields = automation.definition.trigger.inputs.fields
-    for (let key of Object.keys(fields || {})) {
+    for (let key of Object.keys(fields)) {
       coercedFields[key] = coerce(params.fields[key], fields[key])
     }
     params.fields = coercedFields

package/src/db/linkedRows/index.js

@@ -65,7 +65,6 @@ async function getLinksForRows(rows) {
   // return duplicates, could be querying for both tables in a relation
   return getUniqueByProp(
     responses
-      .filter(el => el != null)
       // create a unique ID which we can use for getting only unique ones
       .map(el => ({ ...el, unique: el.id + el.thisId + el.fieldName })),
     "unique"

package/src/db/utils.js

@@ -11,8 +11,6 @@ const {
   isProdAppID,
   getDevelopmentAppID,
   generateAppID,
-  getQueryIndex,
-  ViewNames,
 } = require("@budibase/backend-core/db")
 
 const UNICODE_MAX = "\ufff0"
@@ -24,7 +22,11 @@ const AppStatus = {
 }
 
 const DocumentTypes = {
-  ...CoreDocTypes,
+  APP: CoreDocTypes.APP,
+  DEV: CoreDocTypes.DEV,
+  APP_DEV: CoreDocTypes.APP_DEV,
+  APP_METADATA: CoreDocTypes.APP_METADATA,
+  ROLE: CoreDocTypes.ROLE,
   TABLE: "ta",
   ROW: "ro",
   USER: "us",
@@ -43,6 +45,11 @@ const DocumentTypes = {
   USER_FLAG: "flag",
 }
 
+const ViewNames = {
+  LINK: "by_link",
+  ROUTING: "screen_routes",
+}
+
 const InternalTables = {
   USER_METADATA: "ta_users",
 }
@@ -67,7 +74,6 @@ exports.isDevAppID = isDevAppID
 exports.isProdAppID = isProdAppID
 exports.USER_METDATA_PREFIX = `${DocumentTypes.ROW}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`
 exports.LINK_USER_METADATA_PREFIX = `${DocumentTypes.LINK}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`
-exports.TABLE_ROW_PREFIX = `${DocumentTypes.ROW}${SEPARATOR}${DocumentTypes.TABLE}`
 exports.ViewNames = ViewNames
 exports.InternalTables = InternalTables
 exports.DocumentTypes = DocumentTypes
@@ -82,7 +88,9 @@ exports.generateDevAppID = getDevelopmentAppID
 exports.generateRoleID = generateRoleID
 exports.getRoleParams = getRoleParams
 
-exports.getQueryIndex = getQueryIndex
+exports.getQueryIndex = viewName => {
+  return `database/${viewName}`
+}
 
 /**
  * If creating DB allDocs/query params with only a single top level ID this can be used, this

package/src/definitions/common.ts

@@ -12,7 +12,6 @@ export interface Application extends Base {
 export interface FieldSchema {
   // TODO: replace with field types enum when done
   type: string
-  externalType?: string
   fieldName?: string
   name: string
   tableId?: string

package/src/definitions/datasource.ts

@@ -50,7 +50,6 @@ export enum SourceNames {
   GOOGLE_SHEETS = "GOOGLE_SHEETS",
   FIRESTORE = "FIRESTORE",
   REDIS = "REDIS",
-  SNOWFLAKE = "SNOWFLAKE",
 }
 
 export enum IncludeRelationships {
@@ -94,7 +93,6 @@ export interface Integration {
   relationships?: boolean
   description: string
   friendlyName: string
-  type?: string
   datasource: {}
   query: {
     [key: string]: QueryDefinition

package/src/environment.js

@@ -78,7 +78,6 @@ module.exports = {
   ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
   DISABLE_THREADING: process.env.DISABLE_THREADING,
   DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
-  DISABLE_AUTOMATION_LOGS: process.env.DISABLE_AUTOMATION_LOGS,
   MULTI_TENANCY: process.env.MULTI_TENANCY,
   ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
   SELF_HOSTED: process.env.SELF_HOSTED,

package/src/integrations/airtable.ts

@@ -18,7 +18,6 @@ module AirtableModule {
     description:
       "Airtable is a spreadsheet-database hybrid, with the features of a database but applied to a spreadsheet.",
     friendlyName: "Airtable",
-    type: "Spreadsheet",
     datasource: {
       apiKey: {
         type: DatasourceFieldTypes.PASSWORD,

package/src/integrations/arangodb.ts

@@ -19,7 +19,6 @@ module ArangoModule {
   const SCHEMA: Integration = {
     docs: "https://github.com/arangodb/arangojs",
     friendlyName: "ArangoDB",
-    type: "Non-relational",
     description:
       "ArangoDB is a scalable open-source multi-model database natively supporting graph, document and search. All supported data models & access patterns can be combined in queries allowing for maximal flexibility. ",
     datasource: {

package/src/integrations/base/sql.ts

@@ -89,28 +89,6 @@ function parseFilters(filters: SearchFilters | undefined): SearchFilters {
   return filters
 }
 
-function generateSelectStatement(
-  json: QueryJson,
-  knex: Knex
-): (string | Knex.Raw)[] {
-  const { resource, meta } = json
-  const schema = meta?.table?.schema
-  return resource.fields.map(field => {
-    const fieldNames = field.split(/\./g)
-    const tableName = fieldNames[0]
-    const columnName = fieldNames[1]
-    if (columnName && knex.client.config.client === SqlClients.POSTGRES) {
-      const externalType = schema?.[columnName].externalType
-      if (externalType?.includes("money")) {
-        return knex.raw(
-          `"${tableName}"."${columnName}"::money::numeric as "${field}"`
-        )
-      }
-    }
-    return `${field} as ${field}`
-  })
-}
-
 class InternalBuilder {
   private readonly client: string
 
@@ -238,7 +216,9 @@ class InternalBuilder {
   }
 
   addRelationships(
+    knex: Knex,
     query: KnexQuery,
+    fields: string | string[],
     fromTable: string,
     relationships: RelationshipsJson[] | undefined
   ): KnexQuery {
@@ -343,12 +323,12 @@ class InternalBuilder {
     if (!resource) {
       resource = { fields: [] }
     }
-    let selectStatement: string | (string | Knex.Raw)[] = "*"
+    let selectStatement: string | string[] = "*"
     // handle select
     if (resource.fields && resource.fields.length > 0) {
       // select the resources as the format "table.columnName" - this is what is provided
       // by the resource builder further up
-      selectStatement = generateSelectStatement(json, knex)
+      selectStatement = resource.fields.map(field => `${field} as ${field}`)
     }
     let foundLimit = limit || BASE_LIMIT
     // handle pagination
@@ -383,7 +363,13 @@ class InternalBuilder {
       preQuery = this.addSorting(preQuery, json)
     }
     // handle joins
-    query = this.addRelationships(preQuery, tableName, relationships)
+    query = this.addRelationships(
+      knex,
+      preQuery,
+      selectStatement,
+      tableName,
+      relationships
+    )
     return this.addFilters(query, filters, { relationship: true })
   }
 

package/src/integrations/couchdb.ts

@@ -16,7 +16,6 @@ module CouchDBModule {
   const SCHEMA: Integration = {
     docs: "https://docs.couchdb.org/en/stable/",
     friendlyName: "CouchDB",
-    type: "Non-relational",
     description:
       "Apache CouchDB is an open-source document-oriented NoSQL database, implemented in Erlang.",
     datasource: {

package/src/integrations/dynamodb.ts

@@ -21,7 +21,6 @@ module DynamoModule {
     description:
       "Amazon DynamoDB is a key-value and document database that delivers single-digit millisecond performance at any scale.",
     friendlyName: "DynamoDB",
-    type: "Non-relational",
     datasource: {
       region: {
         type: DatasourceFieldTypes.STRING,

package/src/integrations/elasticsearch.ts

@@ -17,7 +17,6 @@ module ElasticsearchModule {
     description:
       "Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.",
     friendlyName: "ElasticSearch",
-    type: "Non-relational",
     datasource: {
       url: {
         type: DatasourceFieldTypes.STRING,

package/src/integrations/firebase.ts

@@ -16,7 +16,6 @@ module Firebase {
   const SCHEMA: Integration = {
     docs: "https://firebase.google.com/docs/firestore/quickstart",
     friendlyName: "Firestore",
-    type: "Non-relational",
     description:
       "Cloud Firestore is a flexible, scalable database for mobile, web, and server development from Firebase and Google Cloud.",
     datasource: {

package/src/integrations/googlesheets.ts

@@ -49,7 +49,6 @@ module GoogleSheetsModule {
     description:
       "Create and collaborate on online spreadsheets in real-time and from any device. ",
     friendlyName: "Google Sheets",
-    type: "Spreadsheet",
     datasource: {
       spreadsheetId: {
         display: "Google Sheet URL",

package/src/integrations/index.ts

@@ -12,7 +12,6 @@ const rest = require("./rest")
 const googlesheets = require("./googlesheets")
 const firebase = require("./firebase")
 const redis = require("./redis")
-const snowflake = require("./snowflake")
 const { SourceNames } = require("../definitions/datasource")
 const environment = require("../environment")
 
@@ -30,7 +29,6 @@ const DEFINITIONS = {
   [SourceNames.REST]: rest.schema,
   [SourceNames.FIRESTORE]: firebase.schema,
   [SourceNames.REDIS]: redis.schema,
-  [SourceNames.SNOWFLAKE]: snowflake.schema,
 }
 
 const INTEGRATIONS = {
@@ -48,8 +46,6 @@ const INTEGRATIONS = {
   [SourceNames.FIRESTORE]: firebase.integration,
   [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
   [SourceNames.REDIS]: redis.integration,
-  [SourceNames.FIREBASE]: firebase.integration,
-  [SourceNames.SNOWFLAKE]: snowflake.integration,
 }
 
 // optionally add oracle integration if the oracle binary can be installed

package/src/integrations/microsoftSqlServer.ts

@@ -44,7 +44,6 @@ module MSSQLModule {
     description:
       "Microsoft SQL Server is a relational database management system developed by Microsoft. ",
     friendlyName: "MS SQL Server",
-    type: "Relational",
     datasource: {
       user: {
         type: DatasourceFieldTypes.STRING,
@@ -247,7 +246,6 @@ module MSSQLModule {
             autocolumn: !!autoColumns.find((col: string) => col === name),
             name: name,
             ...convertSqlType(def.DATA_TYPE),
-            externalType: def.DATA_TYPE,
           }
         }
         tables[tableName] = {

package/src/integrations/mongodb.ts

@@ -24,7 +24,6 @@ module MongoDBModule {
   const SCHEMA: Integration = {
     docs: "https://github.com/mongodb/node-mongodb-native",
     friendlyName: "MongoDB",
-    type: "Non-relational",
     description:
       "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era.",
     datasource: {

package/src/integrations/mysql.ts

@@ -36,7 +36,6 @@ module MySQLModule {
     docs: "https://github.com/sidorares/node-mysql2",
     plus: true,
     friendlyName: "MySQL",
-    type: "Relational",
     description:
       "MySQL Database Service is a fully managed database service to deploy cloud-native applications. ",
     datasource: {
@@ -233,7 +232,6 @@ module MySQLModule {
               autocolumn: isAuto,
               constraints,
               ...convertSqlType(column.Type),
-              externalType: column.Type,
             }
           }
           if (!tables[tableName]) {

package/src/integrations/oracle.ts

@@ -40,7 +40,6 @@ module OracleModule {
     docs: "https://github.com/oracle/node-oracledb",
     plus: true,
     friendlyName: "Oracle",
-    type: "Relational",
     description:
       "Oracle Database is an object-relational database management system developed by Oracle Corporation",
     datasource: {

package/src/integrations/postgres.ts

@@ -47,7 +47,6 @@ module PostgresModule {
     docs: "https://node-postgres.com",
     plus: true,
     friendlyName: "PostgreSQL",
-    type: "Relational",
     description:
       "PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance.",
     datasource: {
@@ -272,7 +271,6 @@ module PostgresModule {
             autocolumn: isAuto,
             name: columnName,
             ...convertSqlType(column.data_type),
-            externalType: column.data_type,
           }
         }
 

package/src/integrations/queries/sql.ts

@@ -9,9 +9,7 @@ export function enrichQueryFields(
   parameters = {}
 ) {
   const enrichedQuery: { [key: string]: any } = Array.isArray(fields) ? [] : {}
-  if (!fields || !parameters) {
-    return enrichedQuery
-  }
+
   // enrich the fields with dynamic parameters
   for (let key of Object.keys(fields)) {
     if (fields[key] == null) {

package/src/integrations/redis.ts

@@ -17,7 +17,6 @@ module RedisModule {
     docs: "https://redis.io/docs/",
     description: "",
     friendlyName: "Redis",
-    type: "Non-relational",
     datasource: {
       host: {
         type: "string",

package/src/integrations/rest.ts

@@ -64,7 +64,6 @@ module RestModule {
     description:
       "With the REST API datasource, you can connect, query and pull data from multiple REST APIs. You can then use the retrieved data to build apps.",
     friendlyName: "REST API",
-    type: "API",
     datasource: {
       url: {
         type: DatasourceFieldTypes.STRING,
@@ -287,7 +286,7 @@ module RestModule {
           input.body = form
           break
         case BodyTypes.XML:
-          if (object != null && Object.keys(object).length) {
+          if (object != null) {
             string = new XmlBuilder().buildObject(object)
           }
           input.body = string

package/src/integrations/s3.ts

@@ -17,7 +17,6 @@ module S3Module {
     description:
       "Amazon Simple Storage Service (Amazon S3) is an object storage service that offers industry-leading scalability, data availability, security, and performance.",
     friendlyName: "Amazon S3",
-    type: "Object store",
     datasource: {
       region: {
         type: "string",

package/src/integrations/tests/rest.spec.js

@@ -155,27 +155,12 @@ describe("REST Integration", () => {
       expect(output.headers["Content-Type"]).toEqual("application/json")
     })
 
-    it("should allow raw XML", () => {
-      const output = config.integration.addBody("xml", "<a>1</a><b>2</b>", {})
-      expect(output.body.includes("<a>1</a>")).toEqual(true)
-      expect(output.body.includes("<b>2</b>")).toEqual(true)
-      expect(output.headers["Content-Type"]).toEqual("application/xml")
-    })
-
-    it("should allow a valid js object and parse the contents to xml", () => {
+    it("should allow XML", () => {
       const output = config.integration.addBody("xml", input, {})
       expect(output.body.includes("<a>1</a>")).toEqual(true)
       expect(output.body.includes("<b>2</b>")).toEqual(true)
       expect(output.headers["Content-Type"]).toEqual("application/xml")
     })
-
-    it("should allow a valid json string and parse the contents to xml", () => {
-      const output = config.integration.addBody("xml", JSON.stringify(input), {})
-      expect(output.body.includes("<a>1</a>")).toEqual(true)
-      expect(output.body.includes("<b>2</b>")).toEqual(true)
-      expect(output.headers["Content-Type"]).toEqual("application/xml")
-    })
-
   })
 
   describe("response", () => {

package/src/migrations/tests/index.spec.ts

@@ -93,24 +93,8 @@ describe("migrations", () => {
       await clearMigrations()
       const appId = config.prodAppId
       const roles = { [appId]: "role_12345" }
-      await config.createUser(
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        false,
-        true,
-        roles
-      ) // admin only
-      await config.createUser(
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        false,
-        false,
-        roles
-      ) // non admin non builder
+      await config.createUser(undefined, undefined, false, true, roles) // admin only
+      await config.createUser(undefined, undefined, false, false, roles) // non admin non builder
       await config.createTable()
       await config.createRow()
       await config.createRow()

package/src/module.d.ts

@@ -8,5 +8,3 @@ declare module "@budibase/backend-core/constants"
 declare module "@budibase/backend-core/auth"
 declare module "@budibase/backend-core/sessions"
 declare module "@budibase/backend-core/encryption"
-declare module "@budibase/backend-core/utils"
-declare module "@budibase/backend-core/redis"

package/src/tests/utilities/TestConfiguration.js

@@ -28,8 +28,6 @@ const { encrypt } = require("@budibase/backend-core/encryption")
 
 const GLOBAL_USER_ID = "us_uuid1"
 const EMAIL = "babs@babs.com"
-const FIRSTNAME = "Barbara"
-const LASTNAME = "Barbington"
 const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306"
 
 class TestConfiguration {
@@ -61,15 +59,6 @@ class TestConfiguration {
     return this.prodAppId
   }
 
-  getUserDetails() {
-    return {
-      globalId: GLOBAL_USER_ID,
-      email: EMAIL,
-      firstName: FIRSTNAME,
-      lastName: LASTNAME,
-    }
-  }
-
   async doInContext(appId, task) {
     if (!appId) {
       appId = this.appId
@@ -129,8 +118,6 @@ class TestConfiguration {
   // USER / AUTH
   async globalUser({
     id = GLOBAL_USER_ID,
-    firstName = FIRSTNAME,
-    lastName = LASTNAME,
     builder = true,
     admin = false,
     email = EMAIL,
@@ -148,8 +135,6 @@ class TestConfiguration {
         ...existing,
         roles: roles || {},
         tenantId: TENANT_ID,
-        firstName,
-        lastName,
       }
       await createASession(id, {
         sessionId: "sessionid",
@@ -176,8 +161,6 @@ class TestConfiguration {
 
   async createUser(
     id = null,
-    firstName = FIRSTNAME,
-    lastName = LASTNAME,
     email = EMAIL,
     builder = true,
     admin = false,
@@ -186,8 +169,6 @@ class TestConfiguration {
     const globalId = !id ? `us_${Math.random()}` : `us_${id}`
     const resp = await this.globalUser({
       id: globalId,
-      firstName,
-      lastName,
       email,
       builder,
       admin,
@@ -539,14 +520,14 @@ class TestConfiguration {
 
   // QUERY
 
-  async previewQuery(request, config, datasource, fields, params, verb) {
+  async previewQuery(request, config, datasource, fields) {
     return request
       .post(`/api/queries/preview`)
       .send({
         datasourceId: datasource._id,
-        parameters: params || {},
+        parameters: {},
         fields,
-        queryVerb: verb || "read",
+        queryVerb: "read",
         name: datasource.name,
       })
       .set(config.defaultHeaders())

package/src/threads/automation.js

@@ -9,12 +9,11 @@ const { doInTenant } = require("@budibase/backend-core/tenancy")
 const { definitions: triggerDefs } = require("../automations/triggerInfo")
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
 const { AutomationErrors, LoopStepTypes } = require("../constants")
-const { storeLog } = require("../automations/logging")
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId
 const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId
 
 const CRON_STEP_ID = triggerDefs.CRON.stepId
-const STOPPED_STATUS = { success: true, status: "STOPPED" }
+const STOPPED_STATUS = { success: false, status: "STOPPED" }
 const { cloneDeep } = require("lodash/fp")
 const env = require("../environment")
 
@@ -219,7 +218,7 @@ class Orchestrator {
             }
           }
           if (
-            index === env.AUTOMATION_MAX_ITERATION ||
+            index === parseInt(env.AUTOMATION_MAX_ITERATIONS) ||
             index === parseInt(loopStep.inputs.iterations)
           ) {
             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
@@ -276,7 +275,7 @@ class Orchestrator {
           this._context.steps[stepCount] = outputs
           // if filter causes us to stop execution don't break the loop, set a var
           // so that we can finish iterating through the steps and record that it stopped
-          if (step.stepId === FILTER_STEP_ID && !outputs.result) {
+          if (step.stepId === FILTER_STEP_ID && !outputs.success) {
             stopped = true
             this.updateExecutionOutput(step.id, step.stepId, step.inputs, {
               ...outputs,
@@ -326,8 +325,6 @@ class Orchestrator {
       }
     }
 
-    // store the logs for the automation run
-    await storeLog(this._automation, this.executionOutput)
     return this.executionOutput
   }
 }