@budibase/server 1.0.49-alpha.0 → 1.0.49-alpha.12

package/dist/utilities/fileSystem/index.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { budibaseTempDir } = require("../budibaseDir");
-const { isDev } = require("../index");
 const fs = require("fs");
 const { join } = require("path");
 const uuid = require("uuid/v4");
@@ -20,6 +19,7 @@ const { updateClientLibrary } = require("./clientLibrary");
 const env = require("../../environment");
 const { USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX, } = require("../../db/utils");
 const MemoryStream = require("memorystream");
+const { getAppId } = require("@budibase/backend-core/context");
 const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..");
 const NODE_MODULES_PATH = join(TOP_LEVEL_PATH, "node_modules");
 /**
@@ -47,7 +47,7 @@ exports.init = () => {
  * everything required to function is ready.
  */
 exports.checkDevelopmentEnvironment = () => {
-    if (!isDev()) {
+    if (!env.isDev() || env.isTest()) {
         return;
     }
     if (!fs.existsSync(budibaseTempDir())) {
@@ -218,7 +218,8 @@ exports.downloadTemplate = (type, name) => __awaiter(void 0, void 0, void 0, fun
 /**
  * Retrieves component libraries from object store (or tmp symlink if in local)
  */
-exports.getComponentLibraryManifest = (appId, library) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getComponentLibraryManifest = (library) => __awaiter(void 0, void 0, void 0, function* () {
+    const appId = getAppId();
     const filename = "manifest.json";
     /* istanbul ignore next */
     // when testing in cypress and so on we need to get the package

package/dist/utilities/global.js

@@ -10,12 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const { getMultiIDParams, getGlobalIDFromUserMetadataID, } = require("../db/utils");
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
-const { getDeployedAppID } = require("@budibase/backend-core/db");
+const { getProdAppID } = require("@budibase/backend-core/db");
 const { getGlobalUserParams } = require("@budibase/backend-core/db");
 const { user: userCache } = require("@budibase/backend-core/cache");
 const { getGlobalDB, isUserInAppTenant, } = require("@budibase/backend-core/tenancy");
 const env = require("../environment");
-exports.updateAppRole = (appId, user) => {
+const { getAppId } = require("@budibase/backend-core/context");
+exports.updateAppRole = (user, { appId } = {}) => {
+    appId = appId || getAppId();
     if (!user || !user.roles) {
         return user;
     }
@@ -27,7 +29,7 @@ exports.updateAppRole = (appId, user) => {
         return user;
     }
     // always use the deployed app
-    user.roleId = user.roles[getDeployedAppID(appId)];
+    user.roleId = user.roles[getProdAppID(appId)];
     // if a role wasn't found then either set as admin (builder) or public (everyone else)
     if (!user.roleId && user.builder && user.builder.global) {
         user.roleId = BUILTIN_ROLE_IDS.ADMIN;
@@ -38,27 +40,28 @@ exports.updateAppRole = (appId, user) => {
     delete user.roles;
     return user;
 };
-function processUser(appId, user) {
+function processUser(user, { appId } = {}) {
     if (user) {
         delete user.password;
     }
-    return exports.updateAppRole(appId, user);
+    return exports.updateAppRole(user, { appId });
 }
 exports.getCachedSelf = (ctx, appId) => __awaiter(void 0, void 0, void 0, function* () {
     // this has to be tenant aware, can't depend on the context to find it out
     // running some middlewares before the tenancy causes context to break
     const user = yield userCache.getUser(ctx.user._id);
-    return processUser(appId, user);
+    return processUser(user, { appId });
 });
 exports.getRawGlobalUser = (userId) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getGlobalDB();
     return db.get(getGlobalIDFromUserMetadataID(userId));
 });
-exports.getGlobalUser = (appId, userId) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getGlobalUser = (userId) => __awaiter(void 0, void 0, void 0, function* () {
     let user = yield exports.getRawGlobalUser(userId);
-    return processUser(appId, user);
+    return processUser(user);
 });
-exports.getGlobalUsers = (appId = null, users = null) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getGlobalUsers = (users = null) => __awaiter(void 0, void 0, void 0, function* () {
+    const appId = getAppId();
     const db = getGlobalDB();
     let globalUsers;
     if (users) {
@@ -80,10 +83,10 @@ exports.getGlobalUsers = (appId = null, users = null) => __awaiter(void 0, void
     if (!appId) {
         return globalUsers;
     }
-    return globalUsers.map(user => exports.updateAppRole(appId, user));
+    return globalUsers.map(user => exports.updateAppRole(user));
 });
-exports.getGlobalUsersFromMetadata = (appId, users) => __awaiter(void 0, void 0, void 0, function* () {
-    const globalUsers = yield exports.getGlobalUsers(appId, users);
+exports.getGlobalUsersFromMetadata = (users) => __awaiter(void 0, void 0, void 0, function* () {
+    const globalUsers = yield exports.getGlobalUsers(users);
     return users.map(user => {
         const globalUser = globalUsers.find(globalUser => globalUser && user._id.includes(globalUser._id));
         return Object.assign(Object.assign({}, globalUser), user);

package/dist/utilities/index.js

@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const env = require("../environment");
 const { OBJ_STORE_DIRECTORY } = require("../constants");
 const { sanitizeKey } = require("@budibase/backend-core/objectStore");
-const CouchDB = require("../db");
 const { generateMetadataID } = require("../db/utils");
 const Readable = require("stream").Readable;
+const { getAppDB } = require("@budibase/backend-core/context");
 const BB_CDN = "https://cdn.budi.live";
 exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms));
 exports.isDev = env.isDev;
@@ -72,8 +72,8 @@ exports.clientLibraryPath = (appId, version) => {
 exports.attachmentsRelativeURL = attachmentKey => {
     return exports.checkSlashesInUrl(`${exports.objectStoreUrl()}/${attachmentKey}`);
 };
-exports.updateEntityMetadata = (appId, type, entityId, updateFn) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.updateEntityMetadata = (type, entityId, updateFn) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     const id = generateMetadataID(type, entityId);
     // read it to see if it exists, we'll overwrite it no matter what
     let rev, metadata = {};
@@ -93,13 +93,13 @@ exports.updateEntityMetadata = (appId, type, entityId, updateFn) => __awaiter(vo
     const response = yield db.put(metadata);
     return Object.assign(Object.assign({}, metadata), { _id: id, _rev: response.rev });
 });
-exports.saveEntityMetadata = (appId, type, entityId, metadata) => __awaiter(void 0, void 0, void 0, function* () {
-    return exports.updateEntityMetadata(appId, type, entityId, () => {
+exports.saveEntityMetadata = (type, entityId, metadata) => __awaiter(void 0, void 0, void 0, function* () {
+    return exports.updateEntityMetadata(type, entityId, () => {
         return metadata;
     });
 });
-exports.deleteEntityMetadata = (appId, type, entityId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+exports.deleteEntityMetadata = (type, entityId) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     const id = generateMetadataID(type, entityId);
     let rev;
     try {
@@ -132,16 +132,6 @@ exports.stringToReadStream = string => {
         },
     });
 };
-exports.doesDatabaseExist = (dbName) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const db = new CouchDB(dbName, { skip_setup: true });
-        const info = yield db.info();
-        return info && !info.error;
-    }
-    catch (err) {
-        return false;
-    }
-});
 exports.formatBytes = bytes => {
     const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
     const byteIncrements = 1024;

package/dist/utilities/routing/index.js

@@ -8,11 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../db");
 const { createRoutingView } = require("../../db/views/staticViews");
 const { ViewNames, getQueryIndex, UNICODE_MAX } = require("../../db/utils");
-exports.getRoutingInfo = (appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(appId);
+const { getAppDB } = require("@budibase/backend-core/context");
+exports.getRoutingInfo = () => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     try {
         const allRouting = yield db.query(getQueryIndex(ViewNames.ROUTING), {
             startKey: "",
@@ -24,8 +24,8 @@ exports.getRoutingInfo = (appId) => __awaiter(void 0, void 0, void 0, function*
         // check if the view doesn't exist, it should for all new instances
         /* istanbul ignore next */
         if (err != null && err.name === "not_found") {
-            yield createRoutingView(appId);
-            return exports.getRoutingInfo(appId);
+            yield createRoutingView();
+            return exports.getRoutingInfo();
         }
         else {
             throw err;

package/dist/utilities/rowProcessor/index.js

@@ -15,8 +15,8 @@ const { attachmentsRelativeURL } = require("../index");
 const { processFormulas } = require("./utils");
 const { deleteFiles } = require("../../utilities/fileSystem/utilities");
 const { ObjectStoreBuckets } = require("../../constants");
-const { isProdAppID, getDeployedAppID, dbExists, } = require("@budibase/backend-core/db");
-const CouchDB = require("../../db");
+const { isProdAppID, getProdAppID, dbExists, } = require("@budibase/backend-core/db");
+const { getAppId } = require("@budibase/backend-core/context");
 const BASE_AUTO_ID = 1;
 /**
  * A map of how we convert various properties in rows to each other based on the row type.
@@ -175,6 +175,7 @@ function processAutoColumn(user, table, row, opts = { reprocessing: false, noAut
     return { table, row };
 }
 exports.processAutoColumn = processAutoColumn;
+exports.processFormulas = processFormulas;
 /**
  * This will coerce a value to the correct types based on the type transform map
  * @param {object} row The value to coerce
@@ -218,11 +219,11 @@ exports.inputProcessing = (user = {}, table, row, opts = { noAutoRelationships:
             }
             continue;
         }
-        // specific case to delete formula values if they get saved
-        // type coercion cannot completely remove the field, so have to do it here
+        // remove any formula values, they are to be generated
         if (field.type === FieldTypes.FORMULA) {
             delete clonedRow[key];
         }
+        // otherwise coerce what is there to correct types
         else {
             clonedRow[key] = exports.coerce(value, field.type);
         }
@@ -237,24 +238,22 @@ exports.inputProcessing = (user = {}, table, row, opts = { noAutoRelationships:
 /**
  * This function enriches the input rows with anything they are supposed to contain, for example
  * link records or attachment links.
- * @param {object} ctx the request which is looking for enriched rows.
  * @param {object} table the table from which these rows came from originally, this is used to determine
  * the schema of the rows and then enrich.
  * @param {object[]|object} rows the rows which are to be enriched.
  * @param {object} opts used to set some options for the output, such as disabling relationship squashing.
  * @returns {object[]|object} the enriched rows will be returned.
  */
-exports.outputProcessing = (ctx, table, rows, opts = { squash: true }) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
+exports.outputProcessing = (table, rows, opts = { squash: true }) => __awaiter(void 0, void 0, void 0, function* () {
     let wasArray = true;
     if (!(rows instanceof Array)) {
         rows = [rows];
         wasArray = false;
     }
     // attach any linked row information
-    let enriched = yield linkRows.attachFullLinkedDocs(ctx, table, rows);
+    let enriched = yield linkRows.attachFullLinkedDocs(table, rows);
     // process formulas
-    enriched = processFormulas(table, enriched);
+    enriched = processFormulas(table, enriched, { dynamic: true });
     // update the attachments URL depending on hosting
     for (let [property, column] of Object.entries(table.schema)) {
         if (column.type === FieldTypes.ATTACHMENT) {
@@ -269,24 +268,26 @@ exports.outputProcessing = (ctx, table, rows, opts = { squash: true }) => __awai
         }
     }
     if (opts.squash) {
-        enriched = yield linkRows.squashLinksToPrimaryDisplay(appId, table, enriched);
+        enriched = yield linkRows.squashLinksToPrimaryDisplay(table, enriched);
     }
     return wasArray ? enriched : enriched[0];
 });
 /**
  * Clean up any attachments that were attached to a row.
- * @param {string} appId The ID of the app from which a row is being deleted.
  * @param {object} table The table from which a row is being removed.
  * @param {any} row optional - the row being removed.
  * @param {any} rows optional - if multiple rows being deleted can do this in bulk.
  * @param {any} oldRow optional - if updating a row this will determine the difference.
+ * @param {any} oldTable optional - if updating a table, can supply the old table to look for
+ * deleted attachment columns.
  * @return {Promise<void>} When all attachments have been removed this will return.
  */
-exports.cleanupAttachments = (appId, table, { row, rows, oldRow }) => __awaiter(void 0, void 0, void 0, function* () {
+exports.cleanupAttachments = (table, { row, rows, oldRow, oldTable }) => __awaiter(void 0, void 0, void 0, function* () {
+    const appId = getAppId();
     if (!isProdAppID(appId)) {
-        const prodAppId = getDeployedAppID(appId);
+        const prodAppId = getProdAppID(appId);
         // if prod exists, then don't allow deleting
-        const exists = yield dbExists(CouchDB, prodAppId);
+        const exists = yield dbExists(prodAppId);
         if (exists) {
             return;
         }
@@ -297,12 +298,17 @@ exports.cleanupAttachments = (appId, table, { row, rows, oldRow }) => __awaiter(
             files = files.concat(row[key].map(attachment => attachment.key));
         }
     }
-    for (let [key, schema] of Object.entries(table.schema)) {
+    const schemaToUse = oldTable ? oldTable.schema : table.schema;
+    for (let [key, schema] of Object.entries(schemaToUse)) {
         if (schema.type !== FieldTypes.ATTACHMENT) {
             continue;
         }
-        // if updating, need to manage the differences
-        if (oldRow && row) {
+        // old table had this column, new table doesn't - delete it
+        if (oldTable && !table.schema[key]) {
+            rows.forEach(row => addFiles(row, key));
+        }
+        else if (oldRow && row) {
+            // if updating, need to manage the differences
             files = files.concat(getRemovedAttachmentKeys(oldRow, row, key));
         }
         else if (row) {

package/dist/utilities/rowProcessor/utils.js

@@ -1,20 +1,30 @@
 "use strict";
-const { FieldTypes } = require("../../constants");
+const { FieldTypes, FormulaTypes } = require("../../constants");
 const { processStringSync } = require("@budibase/string-templates");
 /**
  * Looks through the rows provided and finds formulas - which it then processes.
  */
-exports.processFormulas = (table, rows) => {
+exports.processFormulas = (table, rows, { dynamic, contextRows } = { dynamic: true }) => {
     const single = !Array.isArray(rows);
     if (single) {
         rows = [rows];
+        contextRows = contextRows ? [contextRows] : contextRows;
     }
     for (let [column, schema] of Object.entries(table.schema)) {
-        if (schema.type !== FieldTypes.FORMULA) {
+        const isStatic = schema.formulaType === FormulaTypes.STATIC;
+        if (schema.type !== FieldTypes.FORMULA ||
+            (dynamic && isStatic) ||
+            (!dynamic && !isStatic)) {
             continue;
         }
         // iterate through rows and process formula
-        rows = rows.map(row => (Object.assign(Object.assign({}, row), { [column]: processStringSync(schema.formula, row) })));
+        for (let i = 0; i < rows.length; i++) {
+            if (schema.formula) {
+                let row = rows[i];
+                let context = contextRows ? contextRows[i] : row;
+                rows[i] = Object.assign(Object.assign({}, row), { [column]: processStringSync(schema.formula, context) });
+            }
+        }
     }
     return single ? rows[0] : rows;
 };

package/dist/utilities/usageQuota/index.js

@@ -52,6 +52,7 @@ exports.getUsageQuotaDoc = (db) => __awaiter(void 0, void 0, void 0, function* (
  * Given a specified tenantId this will add to the usage object for the specified property.
  * @param {string} property The property which is to be added to (within the nested usageQuota object).
  * @param {number} usage The amount (this can be negative) to adjust the number by.
+ * @param {object} opts optional - options such as dryRun, to check what update will do.
  * @returns {Promise<void>} When this completes the API key will now be up to date - the quota period may have
  * also been reset after this call.
  */

package/dist/utilities/usageQuota/rows.js

@@ -31,6 +31,7 @@ const getAppPairs = appIds => {
     return pairs;
 };
 const getAppRows = (appId) => __awaiter(void 0, void 0, void 0, function* () {
+    // need to specify the app ID, as this is used for different apps in one call
     const appDb = new CouchDB(appId);
     const response = yield appDb.allDocs(getRowParams(null, null, {
         include_docs: false,

package/dist/utilities/users.js

@@ -8,15 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../db");
 const { InternalTables } = require("../db/utils");
 const { getGlobalUser } = require("../utilities/global");
+const { getAppDB } = require("@budibase/backend-core/context");
 exports.getFullUser = (ctx, userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const global = yield getGlobalUser(ctx.appId, userId);
+    const global = yield getGlobalUser(userId);
     let metadata;
     try {
         // this will throw an error if the db doesn't exist, or there is no appId
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         metadata = yield db.get(userId);
     }
     catch (err) {

package/dist/utilities/workerRequests.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const fetch = require("node-fetch");
 const env = require("../environment");
 const { checkSlashesInUrl } = require("./index");
-const { getDeployedAppID } = require("@budibase/backend-core/db");
+const { getProdAppID } = require("@budibase/backend-core/db");
 const { updateAppRole } = require("./global");
 const { Headers } = require("@budibase/backend-core/constants");
 const { getTenantId, isTenantIdSet } = require("@budibase/backend-core/tenancy");
@@ -71,13 +71,13 @@ exports.getGlobalSelf = (ctx, appId = null) => __awaiter(void 0, void 0, void 0,
     }
     let json = yield response.json();
     if (appId) {
-        json = updateAppRole(appId, json);
+        json = updateAppRole(json);
     }
     return json;
 });
 exports.removeAppFromUserRoles = (ctx, appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const deployedAppId = getDeployedAppID(appId);
-    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + `/api/global/roles/${deployedAppId}`), request(ctx, {
+    const prodAppId = getProdAppID(appId);
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + `/api/global/roles/${prodAppId}`), request(ctx, {
         method: "DELETE",
     }));
     if (response.status !== 200) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.49-alpha.0",
+  "version": "1.0.49-alpha.12",
   "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.49-alpha.0",
-    "@budibase/client": "^1.0.49-alpha.0",
-    "@budibase/string-templates": "^1.0.49-alpha.0",
+    "@budibase/backend-core": "^1.0.49-alpha.12",
+    "@budibase/client": "^1.0.49-alpha.12",
+    "@budibase/string-templates": "^1.0.49-alpha.12",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -168,5 +168,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "27d295ae310158a0a240fe62c45362ad03f82115"
+  "gitHead": "77f938b85661b5da74e6f676afed584370ac48e1"
 }

package/scripts/integrations/postgres/init.sql

@@ -9,12 +9,16 @@ CREATE TABLE Persons (
 );
 CREATE TABLE Tasks (
     TaskID SERIAL PRIMARY KEY,
-    PersonID INT,
+    ExecutorID INT,
+    QaID INT,
     Completed BOOLEAN,
     TaskName varchar(255),
-    CONSTRAINT fkPersons
-        FOREIGN KEY(PersonID)
-            REFERENCES Persons(PersonID)
+    CONSTRAINT fkexecutor
+        FOREIGN KEY(ExecutorID)
+            REFERENCES Persons(PersonID),
+    CONSTRAINT fkqa
+        FOREIGN KEY(QaID)
+	    REFERENCES Persons(PersonID)
 );
 CREATE TABLE Products (
     ProductID SERIAL PRIMARY KEY,
@@ -32,8 +36,9 @@ CREATE TABLE Products_Tasks (
     PRIMARY KEY (ProductID, TaskID)
 );
 INSERT INTO Persons (FirstName, LastName, Address, City) VALUES ('Mike', 'Hughes', '123 Fake Street', 'Belfast');
-INSERT INTO Tasks (PersonID, TaskName, Completed) VALUES (1, 'assembling', TRUE);
-INSERT INTO Tasks (PersonID, TaskName, Completed) VALUES (1, 'processing', FALSE);
+INSERT INTO Persons (FirstName, LastName, Address, City) Values ('John', 'Smith', '64 Updown Road', 'Dublin');
+INSERT INTO Tasks (ExecutorID, QaID, TaskName, Completed) VALUES (1, 2, 'assembling', TRUE);
+INSERT INTO Tasks (ExecutorID, QaID, TaskName, Completed) VALUES (2, 1, 'processing', FALSE);
 INSERT INTO Products (ProductName) VALUES ('Computers');
 INSERT INTO Products (ProductName) VALUES ('Laptops');
 INSERT INTO Products (ProductName) VALUES ('Chairs');

package/scripts/likeCypress.ts

@@ -30,4 +30,4 @@ process.env.ALLOW_DEV_AUTOMATIONS = "1"
 const server = require("../src/app")
 process.env.PORT = WORKER_PORT
 const worker = require("../../worker/src/index")
-process.env.PORT = MAIN_PORT
+process.env.PORT = MAIN_PORT