@budibase/server 1.0.46-alpha.7 → 1.0.48

package/dist/integrations/index.js

@@ -10,7 +10,6 @@ const airtable = require("./airtable");
 const mysql = require("./mysql");
 const arangodb = require("./arangodb");
 const rest = require("./rest");
-const googlesheets = require("./googlesheets");
 const { SourceNames } = require("../definitions/datasource");
 const DEFINITIONS = {
     [SourceNames.POSTGRES]: postgres.schema,
@@ -24,7 +23,6 @@ const DEFINITIONS = {
     [SourceNames.MYSQL]: mysql.schema,
     [SourceNames.ARANGODB]: arangodb.schema,
     [SourceNames.REST]: rest.schema,
-    [SourceNames.GOOGLE_SHEETS]: googlesheets.schema,
 };
 const INTEGRATIONS = {
     [SourceNames.POSTGRES]: postgres.integration,
@@ -38,7 +36,6 @@ const INTEGRATIONS = {
     [SourceNames.MYSQL]: mysql.integration,
     [SourceNames.ARANGODB]: arangodb.integration,
     [SourceNames.REST]: rest.integration,
-    [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (!(process.arch === "arm64" && process.platform === "darwin")) {

package/dist/integrations/utils.js

@@ -125,12 +125,7 @@ function isSQL(datasource) {
     if (!datasource || !datasource.source) {
         return false;
     }
-    const SQL = [
-        datasource_1.SourceNames.POSTGRES,
-        datasource_1.SourceNames.SQL_SERVER,
-        datasource_1.SourceNames.MYSQL,
-        datasource_1.SourceNames.ORACLE,
-    ];
+    const SQL = [datasource_1.SourceNames.POSTGRES, datasource_1.SourceNames.SQL_SERVER, datasource_1.SourceNames.MYSQL];
     return SQL.indexOf(datasource.source) !== -1;
 }
 exports.isSQL = isSQL;
@@ -142,43 +137,8 @@ function isIsoDateString(str) {
     return d.toISOString() === str;
 }
 exports.isIsoDateString = isIsoDateString;
-/**
- * This function will determine whether a column is a relationship and whether it
- * is currently valid. The reason for the validity check is that tables can be deleted
- * outside of Budibase control and if this is the case it will break Budibase relationships.
- * The tableIds is a list passed down from the main finalise tables function, which is
- * based on the tables that have just been fetched. This will only really be used on subsequent
- * fetches to the first one - if the user is periodically refreshing Budibase knowledge of tables.
- * @param column The column to check, to see if it is a valid relationship.
- * @param tableIds The IDs of the tables which currently exist.
- */
-function shouldCopyRelationship(column, tableIds) {
-    return (column.type === constants_1.FieldTypes.LINK &&
-        column.tableId &&
-        tableIds.includes(column.tableId));
-}
-/**
- * Similar function to the shouldCopyRelationship function, but instead this looks for options and boolean
- * types. It is possible to switch a string -> options and a number -> boolean (and vice versus) need to make
- * sure that these get copied over when tables are fetched. Also checks whether they are still valid, if a
- * column has changed type in the external database then copying it over may not be possible.
- * @param column The column to check for options or boolean type.
- * @param fetchedColumn The fetched column to check for the type in the external database.
- */
-function shouldCopySpecialColumn(column, fetchedColumn) {
-    return (column.type === constants_1.FieldTypes.OPTIONS ||
-        ((!fetchedColumn || fetchedColumn.type === constants_1.FieldTypes.NUMBER) &&
-            column.type === constants_1.FieldTypes.BOOLEAN));
-}
-/**
- * Looks for columns which need to be copied over into the new table definitions, like relationships
- * and options types.
- * @param tableName The name of the table which is being checked.
- * @param table The specific table which is being checked.
- * @param entities All the tables that existed before - the old table definitions.
- * @param tableIds The IDs of the tables which exist now, to check if anything has been removed.
- */
-function copyExistingPropsOver(tableName, table, entities, tableIds) {
+// add the existing relationships from the entities if they exist, to prevent them from being overridden
+function copyExistingPropsOver(tableName, table, entities) {
     if (entities && entities[tableName]) {
         if (entities[tableName].primaryDisplay) {
             table.primaryDisplay = entities[tableName].primaryDisplay;
@@ -188,28 +148,21 @@ function copyExistingPropsOver(tableName, table, entities, tableIds) {
             if (!existingTableSchema.hasOwnProperty(key)) {
                 continue;
             }
-            const column = existingTableSchema[key];
-            if (shouldCopyRelationship(column, tableIds) ||
-                shouldCopySpecialColumn(column, table.schema[key])) {
+            if (existingTableSchema[key].type === constants_1.FieldTypes.LINK ||
+                existingTableSchema[key].type === constants_1.FieldTypes.OPTIONS ||
+                existingTableSchema[key].type === constants_1.FieldTypes.ARRAY ||
+                ((!table.schema[key] || table.schema[key].type === constants_1.FieldTypes.NUMBER) &&
+                    existingTableSchema[key].type === constants_1.FieldTypes.BOOLEAN)) {
                 table.schema[key] = existingTableSchema[key];
             }
         }
     }
     return table;
 }
-/**
- * Look through the final table definitions to see if anything needs to be
- * copied over from the old and if any errors have occurred mark them so
- * that the user can be made aware.
- * @param tables The list of tables that have been retrieved from the external database.
- * @param entities The old list of tables, if there was any to look for definitions in.
- */
 function finaliseExternalTables(tables, entities) {
     const invalidColumns = Object.values(constants_1.InvalidColumns);
     let finalTables = {};
     const errors = {};
-    // @ts-ignore
-    const tableIds = Object.values(tables).map(table => table._id);
     for (let [name, table] of Object.entries(tables)) {
         const schemaFields = Object.keys(table.schema);
         // make sure every table has a key
@@ -222,7 +175,7 @@ function finaliseExternalTables(tables, entities) {
             continue;
         }
         // make sure all previous props have been added back
-        finalTables[name] = copyExistingPropsOver(name, table, entities, tableIds);
+        finalTables[name] = copyExistingPropsOver(name, table, entities);
     }
     // sort the tables by name
     finalTables = Object.entries(finalTables)

package/dist/middleware/usageQuota.js

@@ -10,9 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const CouchDB = require("../db");
 const usageQuota = require("../utilities/usageQuota");
-const { getUniqueRows } = require("../utilities/usageQuota/rows");
+const env = require("../environment");
+const { getTenantId } = require("@budibase/backend-core/tenancy");
 const { isExternalTable, isRowId: isExternalRowId, } = require("../integrations/utils");
-const migration = require("../migrations/usageQuotas");
+// tenants without limits
+const EXCLUDED_TENANTS = ["bb", "default", "bbtest", "bbstaging"];
 // currently only counting new writes and deletes
 const METHOD_MAP = {
     POST: 1,
@@ -20,13 +22,13 @@ const METHOD_MAP = {
 };
 const DOMAIN_MAP = {
     rows: usageQuota.Properties.ROW,
-    // upload: usageQuota.Properties.UPLOAD,            // doesn't work yet
-    // views: usageQuota.Properties.VIEW,               // doesn't work yet
-    // users: usageQuota.Properties.USER,               // doesn't work yet
+    upload: usageQuota.Properties.UPLOAD,
+    views: usageQuota.Properties.VIEW,
+    users: usageQuota.Properties.USER,
     applications: usageQuota.Properties.APPS,
     // this will not be updated by endpoint calls
     // instead it will be updated by triggerInfo
-    // automationRuns: usageQuota.Properties.AUTOMATION, // doesn't work yet
+    automationRuns: usageQuota.Properties.AUTOMATION,
 };
 function getProperty(url) {
     for (let domain of Object.keys(DOMAIN_MAP)) {
@@ -36,7 +38,9 @@ function getProperty(url) {
     }
 }
 module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!usageQuota.useQuotas()) {
+    const tenantId = getTenantId();
+    // if in development or a self hosted cloud usage quotas should not be executed
+    if (env.isDev() || env.SELF_HOSTED || EXCLUDED_TENANTS.includes(tenantId)) {
         return next();
     }
     let usage = METHOD_MAP[ctx.req.method];
@@ -74,83 +78,10 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         usage = files.map(file => file.size).reduce((total, size) => total + size);
     }
     try {
-        yield migration.run();
-        yield performRequest(ctx, next, property, usage);
+        yield usageQuota.update(property, usage);
+        return next();
     }
     catch (err) {
         ctx.throw(400, err);
     }
 });
-const performRequest = (ctx, next, property, usage) => __awaiter(void 0, void 0, void 0, function* () {
-    const usageContext = {
-        skipNext: false,
-        skipUsage: false,
-        [usageQuota.Properties.APPS]: {},
-    };
-    if (usage === -1) {
-        if (PRE_DELETE[property]) {
-            yield PRE_DELETE[property](ctx, usageContext);
-        }
-    }
-    else {
-        if (PRE_CREATE[property]) {
-            yield PRE_CREATE[property](ctx, usageContext);
-        }
-    }
-    // run the request
-    if (!usageContext.skipNext) {
-        yield usageQuota.update(property, usage, { dryRun: true });
-        yield next();
-    }
-    if (usage === -1) {
-        if (POST_DELETE[property]) {
-            yield POST_DELETE[property](ctx, usageContext);
-        }
-    }
-    else {
-        if (POST_CREATE[property]) {
-            yield POST_CREATE[property](ctx, usageContext);
-        }
-    }
-    // update the usage
-    if (!usageContext.skipUsage) {
-        yield usageQuota.update(property, usage);
-    }
-});
-const appPreDelete = (ctx, usageContext) => __awaiter(void 0, void 0, void 0, function* () {
-    if (ctx.query.unpublish) {
-        // don't run usage decrement for unpublish
-        usageContext.skipUsage = true;
-        return;
-    }
-    // store the row count to delete
-    const rows = yield getUniqueRows([ctx.appId]);
-    if (rows.length) {
-        usageContext[usageQuota.Properties.APPS] = { rowCount: rows.length };
-    }
-});
-const appPostDelete = (ctx, usageContext) => __awaiter(void 0, void 0, void 0, function* () {
-    // delete the app rows from usage
-    const rowCount = usageContext[usageQuota.Properties.APPS].rowCount;
-    if (rowCount) {
-        yield usageQuota.update(usageQuota.Properties.ROW, -rowCount);
-    }
-});
-const appPostCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    // app import & template creation
-    if (ctx.request.body.useTemplate === "true") {
-        const rows = yield getUniqueRows([ctx.response.body.appId]);
-        const rowCount = rows ? rows.length : 0;
-        yield usageQuota.update(usageQuota.Properties.ROW, rowCount);
-    }
-});
-const PRE_DELETE = {
-    [usageQuota.Properties.APPS]: appPreDelete,
-};
-const POST_DELETE = {
-    [usageQuota.Properties.APPS]: appPostDelete,
-};
-const PRE_CREATE = {};
-const POST_CREATE = {
-    [usageQuota.Properties.APPS]: appPostCreate,
-};

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.46-alpha.6",
+    "version": "1.0.47",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -70,9 +70,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.46-alpha.6",
-        "@budibase/client": "^1.0.46-alpha.6",
-        "@budibase/string-templates": "^1.0.46-alpha.6",
+        "@budibase/backend-core": "^1.0.47",
+        "@budibase/client": "^1.0.47",
+        "@budibase/string-templates": "^1.0.47",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
@@ -92,8 +92,6 @@
         "fix-path": "3.0.0",
         "form-data": "^4.0.0",
         "fs-extra": "8.1.0",
-        "google-auth-library": "^7.11.0",
-        "google-spreadsheet": "^3.2.0",
         "jimp": "0.16.1",
         "joi": "17.2.1",
         "js-yaml": "^4.1.0",
@@ -112,7 +110,7 @@
         "mongodb": "3.6.3",
         "mssql": "6.2.3",
         "mysql2": "^2.3.1",
-        "node-fetch": "2.6.7",
+        "node-fetch": "2.6.0",
         "open": "^8.4.0",
         "pg": "8.5.1",
         "pino-pretty": "4.0.0",
@@ -141,7 +139,6 @@
         "@jest/test-sequencer": "^24.8.0",
         "@types/apidoc": "^0.50.0",
         "@types/bull": "^3.15.1",
-        "@types/google-spreadsheet": "^3.1.5",
         "@types/jest": "^26.0.23",
         "@types/koa": "^2.13.3",
         "@types/koa-router": "^7.4.2",

package/dist/tests/utilities/TestConfiguration.js

@@ -21,7 +21,6 @@ const { getGlobalDB } = require("@budibase/backend-core/tenancy");
 const { createASession } = require("@budibase/backend-core/sessions");
 const { user: userCache } = require("@budibase/backend-core/cache");
 const CouchDB = require("../../db");
-const newid = require("../../db/newid");
 core.init(CouchDB);
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
@@ -84,8 +83,7 @@ class TestConfiguration {
             return Object.assign({ _rev: resp._rev }, user);
         });
     }
-    // use a new id as the name to avoid name collisions
-    init(appName = newid()) {
+    init(appName = "test_application") {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.globalUser();
             return this.createApp(appName);

package/dist/threads/query.js

@@ -75,10 +75,6 @@ class QueryRunner {
                 yield threadUtils.invalidateDynamicVariables(this.cachedVariables);
                 return this.execute();
             }
-            // check for undefined response
-            if (!rows) {
-                rows = [];
-            }
             // needs to an array for next step
             if (!Array.isArray(rows)) {
                 rows = [rows];