@budibase/server 1.0.212-alpha.4 → 1.0.213

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/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,

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/threads/automation.js

@@ -218,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, {

package/src/utilities/fileSystem/index.js

@@ -21,7 +21,6 @@ const env = require("../../environment")
 const {
   USER_METDATA_PREFIX,
   LINK_USER_METADATA_PREFIX,
-  TABLE_ROW_PREFIX,
 } = require("../../db/utils")
 const MemoryStream = require("memorystream")
 const { getAppId } = require("@budibase/backend-core/context")
@@ -110,23 +109,6 @@ exports.apiFileReturn = contents => {
   return fs.createReadStream(path)
 }
 
-exports.defineFilter = excludeRows => {
-  if (excludeRows) {
-    return doc =>
-      !(
-        doc._id.includes(USER_METDATA_PREFIX) ||
-        doc._id.includes(LINK_USER_METADATA_PREFIX) ||
-        doc._id.includes(TABLE_ROW_PREFIX)
-      )
-  } else if (!excludeRows) {
-    return doc =>
-      !(
-        doc._id.includes(USER_METDATA_PREFIX) ||
-        doc._id.includes(LINK_USER_METADATA_PREFIX)
-      )
-  }
-}
-
 /**
  * Local utility to back up the database state for an app, excluding global user
  * data or user relationships.
@@ -134,10 +116,14 @@ exports.defineFilter = excludeRows => {
  * @param {object} config Config to send to export DB
  * @returns {*} either a string or a stream of the backup
  */
-const backupAppData = async (appId, config, includeRows) => {
+const backupAppData = async (appId, config) => {
   return await exports.exportDB(appId, {
     ...config,
-    filter: exports.defineFilter(includeRows),
+    filter: doc =>
+      !(
+        doc._id.includes(USER_METDATA_PREFIX) ||
+        doc._id.includes(LINK_USER_METADATA_PREFIX)
+      ),
   })
 }
 
@@ -156,8 +142,8 @@ exports.performBackup = async (appId, backupName) => {
  * @param {string} appId The ID of the app which is to be backed up.
  * @returns {*} a readable stream of the backup which is written in real time
  */
-exports.streamBackup = async (appId, includeRows) => {
-  return await backupAppData(appId, { stream: true }, includeRows)
+exports.streamBackup = async appId => {
+  return await backupAppData(appId, { stream: true })
 }
 
 /**

package/src/utilities/fileSystem/utilities.js

@@ -9,7 +9,6 @@ const {
   deleteFolder,
   uploadDirectory,
   downloadTarball,
-  downloadTarballDirect,
 } = require("@budibase/backend-core/objectStore")
 
 /***********************************
@@ -30,5 +29,4 @@ exports.retrieveToTmp = retrieveToTmp
 exports.deleteFolder = deleteFolder
 exports.uploadDirectory = uploadDirectory
 exports.downloadTarball = downloadTarball
-exports.downloadTarballDirect = downloadTarballDirect
 exports.deleteFiles = deleteFiles

package/src/utilities/index.js

@@ -54,17 +54,11 @@ exports.objectStoreUrl = () => {
  * @return {string} The URL to be inserted into appPackage response or server rendered
  * app index file.
  */
-exports.clientLibraryPath = (appId, version, ctx) => {
+exports.clientLibraryPath = (appId, version) => {
   if (env.isProd()) {
-    // TODO: remove - for beta testing UI
-    if (ctx && ctx.cookies.get("beta:design_ui")) {
-      return "https://cdn.budi.live/beta:design_ui/budibase-client.js"
-    }
-
     let url = `${exports.objectStoreUrl()}/${sanitizeKey(
       appId
     )}/budibase-client.js`
-
     // append app version to bust the cache
     if (version) {
       url += `?v=${version}`