@budibase/server 2.1.40-alpha.4 → 2.1.41

package/dist/api/controllers/datasource.js

@@ -8,50 +8,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.query = exports.find = exports.destroy = exports.save = exports.update = exports.buildSchemaFromDb = exports.fetch = void 0;
-const utils_1 = require("../../db/utils");
-const internal_1 = require("./table/internal");
-const constants_1 = require("../../constants");
-const integrations_1 = require("../../integrations");
-const utils_2 = require("./row/utils");
-const utils_3 = require("../../threads/utils");
-const backend_core_1 = require("@budibase/backend-core");
-function fetch(ctx) {
+const { generateDatasourceID, getDatasourceParams, getQueryParams, DocumentType, BudibaseInternalDB, getTableParams, } = require("../../db/utils");
+const { BuildSchemaErrors, InvalidColumns } = require("../../constants");
+const { getIntegration } = require("../../integrations");
+const { getDatasourceAndQuery } = require("./row/utils");
+const { invalidateDynamicVariables } = require("../../threads/utils");
+const { getAppDB } = require("@budibase/backend-core/context");
+const { events } = require("@budibase/backend-core");
+exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         // Get internal tables
-        const db = backend_core_1.context.getAppDB();
-        const internalTables = yield db.allDocs((0, utils_1.getTableParams)(null, {
+        const db = getAppDB();
+        const internalTables = yield db.allDocs(getTableParams(null, {
             include_docs: true,
         }));
-        const internal = internalTables.rows.reduce((acc, row) => {
-            const sourceId = row.doc.sourceId || "bb_internal";
-            acc[sourceId] = acc[sourceId] || [];
-            acc[sourceId].push(row.doc);
-            return acc;
-        }, {});
-        const bbInternalDb = Object.assign({}, utils_1.BudibaseInternalDB);
+        const internal = internalTables.rows.map(row => row.doc);
+        const bbInternalDb = Object.assign(Object.assign({}, BudibaseInternalDB), { entities: internal });
         // Get external datasources
-        const datasources = (yield db.allDocs((0, utils_1.getDatasourceParams)(null, {
+        const datasources = (yield db.allDocs(getDatasourceParams(null, {
             include_docs: true,
         }))).rows.map(row => row.doc);
-        const allDatasources = [bbInternalDb, ...datasources];
-        for (let datasource of allDatasources) {
+        for (let datasource of datasources) {
             if (datasource.config && datasource.config.auth) {
                 // strip secrets from response so they don't show in the network request
                 delete datasource.config.auth;
             }
-            if (datasource.type === backend_core_1.db.BUDIBASE_DATASOURCE_TYPE) {
-                datasource.entities = internal[datasource._id];
-            }
         }
         ctx.body = [bbInternalDb, ...datasources];
     });
-}
-exports.fetch = fetch;
-function buildSchemaFromDb(ctx) {
+};
+exports.buildSchemaFromDb = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         const datasource = yield db.get(ctx.params.datasourceId);
         const tablesFilter = ctx.request.body.tablesFilter;
         let { tables, error } = yield buildSchemaHelper(datasource);
@@ -60,7 +48,7 @@ function buildSchemaFromDb(ctx) {
                 datasource.entities = {};
             }
             for (let key in tables) {
-                if (tablesFilter.some((filter) => filter.toLowerCase() === key.toLowerCase())) {
+                if (tablesFilter.some(filter => filter.toLowerCase() === key.toLowerCase())) {
                     datasource.entities[key] = tables[key];
                 }
             }
@@ -77,14 +65,13 @@ function buildSchemaFromDb(ctx) {
         }
         ctx.body = response;
     });
-}
-exports.buildSchemaFromDb = buildSchemaFromDb;
+};
 /**
  * Make sure all datasource entities have a display name selected
  */
-function setDefaultDisplayColumns(datasource) {
+const setDefaultDisplayColumns = datasource => {
     //
-    for (let entity of Object.values(datasource.entities || {})) {
+    for (let entity of Object.values(datasource.entities)) {
         if (entity.primaryDisplay) {
             continue;
         }
@@ -93,40 +80,37 @@ function setDefaultDisplayColumns(datasource) {
             entity.primaryDisplay = notAutoColumn.name;
         }
     }
-}
+};
 /**
  * Check for variables that have been updated or removed and invalidate them.
  */
-function invalidateVariables(existingDatasource, updatedDatasource) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const existingVariables = (_a = existingDatasource.config) === null || _a === void 0 ? void 0 : _a.dynamicVariables;
-        const updatedVariables = (_b = updatedDatasource.config) === null || _b === void 0 ? void 0 : _b.dynamicVariables;
-        const toInvalidate = [];
-        if (!existingVariables) {
-            return;
-        }
-        if (!updatedVariables) {
-            // invalidate all
-            toInvalidate.push(...existingVariables);
-        }
-        else {
-            // invaldate changed / removed
-            existingVariables.forEach((existing) => {
-                const unchanged = updatedVariables.find((updated) => existing.name === updated.name &&
-                    existing.queryId === updated.queryId &&
-                    existing.value === updated.value);
-                if (!unchanged) {
-                    toInvalidate.push(existing);
-                }
-            });
-        }
-        yield (0, utils_3.invalidateDynamicVariables)(toInvalidate);
-    });
-}
-function update(ctx) {
+const invalidateVariables = (existingDatasource, updatedDatasource) => __awaiter(void 0, void 0, void 0, function* () {
+    const existingVariables = existingDatasource.config.dynamicVariables;
+    const updatedVariables = updatedDatasource.config.dynamicVariables;
+    const toInvalidate = [];
+    if (!existingVariables) {
+        return;
+    }
+    if (!updatedVariables) {
+        // invalidate all
+        toInvalidate.push(...existingVariables);
+    }
+    else {
+        // invaldate changed / removed
+        existingVariables.forEach(existing => {
+            const unchanged = updatedVariables.find(updated => existing.name === updated.name &&
+                existing.queryId === updated.queryId &&
+                existing.value === updated.value);
+            if (!unchanged) {
+                toInvalidate.push(existing);
+            }
+        });
+    }
+    yield invalidateDynamicVariables(toInvalidate);
+});
+exports.update = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         const datasourceId = ctx.params.datasourceId;
         let datasource = yield db.get(datasourceId);
         const auth = datasource.config.auth;
@@ -137,11 +121,11 @@ function update(ctx) {
             datasource.config.auth = auth;
         }
         const response = yield db.put(datasource);
-        yield backend_core_1.events.datasource.updated(datasource);
+        yield events.datasource.updated(datasource);
         datasource._rev = response.rev;
         // Drain connection pools when configuration is changed
         if (datasource.source) {
-            const source = yield (0, integrations_1.getIntegration)(datasource.source);
+            const source = yield getIntegration(datasource.source);
             if (source && source.pool) {
                 yield source.pool.end();
             }
@@ -150,14 +134,13 @@ function update(ctx) {
         ctx.message = "Datasource saved successfully.";
         ctx.body = { datasource };
     });
-}
-exports.update = update;
-function save(ctx) {
+};
+exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         const plus = ctx.request.body.datasource.plus;
         const fetchSchema = ctx.request.body.fetchSchema;
-        const datasource = Object.assign({ _id: (0, utils_1.generateDatasourceID)({ plus }), type: plus ? utils_1.DocumentType.DATASOURCE_PLUS : utils_1.DocumentType.DATASOURCE }, ctx.request.body.datasource);
+        const datasource = Object.assign({ _id: generateDatasourceID({ plus }), type: plus ? DocumentType.DATASOURCE_PLUS : DocumentType.DATASOURCE }, ctx.request.body.datasource);
         let schemaError = null;
         if (fetchSchema) {
             const { tables, error } = yield buildSchemaHelper(datasource);
@@ -166,11 +149,11 @@ function save(ctx) {
             setDefaultDisplayColumns(datasource);
         }
         const dbResp = yield db.put(datasource);
-        yield backend_core_1.events.datasource.created(datasource);
+        yield events.datasource.created(datasource);
         datasource._rev = dbResp.rev;
         // Drain connection pools when configuration is changed
         if (datasource.source) {
-            const source = yield (0, integrations_1.getIntegration)(datasource.source);
+            const source = yield getIntegration(datasource.source);
             if (source && source.pool) {
                 yield source.pool.end();
             }
@@ -181,77 +164,44 @@ function save(ctx) {
         }
         ctx.body = response;
     });
-}
-exports.save = save;
-function destroyInternalTablesBySourceId(datasourceId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        // Get all internal tables
-        const internalTables = yield db.allDocs((0, utils_1.getTableParams)(null, {
-            include_docs: true,
-        }));
-        // Filter by datasource and return the docs.
-        const datasourceTableDocs = internalTables.rows.reduce((acc, table) => {
-            if (table.doc.sourceId == datasourceId) {
-                acc.push(table.doc);
-            }
-            return acc;
-        }, []);
-        // Destroy the tables.
-        for (const table of datasourceTableDocs) {
-            yield (0, internal_1.destroy)({
-                params: {
-                    tableId: table._id,
-                },
-            });
-        }
-    });
-}
-function destroy(ctx) {
+};
+exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         const datasourceId = ctx.params.datasourceId;
         const datasource = yield db.get(datasourceId);
         // Delete all queries for the datasource
-        if (datasource.type === backend_core_1.db.BUDIBASE_DATASOURCE_TYPE) {
-            yield destroyInternalTablesBySourceId(datasourceId);
-        }
-        else {
-            const queries = yield db.allDocs((0, utils_1.getQueryParams)(datasourceId, null));
-            yield db.bulkDocs(queries.rows.map((row) => ({
-                _id: row.id,
-                _rev: row.value.rev,
-                _deleted: true,
-            })));
-        }
+        const queries = yield db.allDocs(getQueryParams(datasourceId, null));
+        yield db.bulkDocs(queries.rows.map(row => ({
+            _id: row.id,
+            _rev: row.value.rev,
+            _deleted: true,
+        })));
         // delete the datasource
         yield db.remove(datasourceId, ctx.params.revId);
-        yield backend_core_1.events.datasource.deleted(datasource);
+        yield events.datasource.deleted(datasource);
         ctx.message = `Datasource deleted.`;
         ctx.status = 200;
     });
-}
-exports.destroy = destroy;
-function find(ctx) {
+};
+exports.find = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const database = backend_core_1.context.getAppDB();
+        const database = getAppDB();
         ctx.body = yield database.get(ctx.params.datasourceId);
     });
-}
-exports.find = find;
+};
 // dynamic query functionality
-function query(ctx) {
+exports.query = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const queryJson = ctx.request.body;
         try {
-            ctx.body = yield (0, utils_2.getDatasourceAndQuery)(queryJson);
+            ctx.body = yield getDatasourceAndQuery(queryJson);
         }
         catch (err) {
             ctx.throw(400, err);
         }
     });
-}
-exports.query = query;
+};
 function getErrorTables(errors, errorType) {
     return Object.entries(errors)
         .filter(entry => entry[1] === errorType)
@@ -267,25 +217,23 @@ function updateError(error, newError, tables) {
     error += `${newError} ${tables.join(", ")}`;
     return error;
 }
-function buildSchemaHelper(datasource) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const Connector = yield (0, integrations_1.getIntegration)(datasource.source);
-        // Connect to the DB and build the schema
-        const connector = new Connector(datasource.config);
-        yield connector.buildSchema(datasource._id, datasource.entities);
-        const errors = connector.schemaErrors;
-        let error = null;
-        if (errors && Object.keys(errors).length > 0) {
-            const noKey = getErrorTables(errors, constants_1.BuildSchemaErrors.NO_KEY);
-            const invalidCol = getErrorTables(errors, constants_1.BuildSchemaErrors.INVALID_COLUMN);
-            if (noKey.length) {
-                error = updateError(error, "No primary key constraint found for the following:", noKey);
-            }
-            if (invalidCol.length) {
-                const invalidCols = Object.values(constants_1.InvalidColumns).join(", ");
-                error = updateError(error, `Cannot use columns ${invalidCols} found in following:`, invalidCol);
-            }
+const buildSchemaHelper = (datasource) => __awaiter(void 0, void 0, void 0, function* () {
+    const Connector = yield getIntegration(datasource.source);
+    // Connect to the DB and build the schema
+    const connector = new Connector(datasource.config);
+    yield connector.buildSchema(datasource._id, datasource.entities);
+    const errors = connector.schemaErrors;
+    let error = null;
+    if (errors && Object.keys(errors).length > 0) {
+        const noKey = getErrorTables(errors, BuildSchemaErrors.NO_KEY);
+        const invalidCol = getErrorTables(errors, BuildSchemaErrors.INVALID_COLUMN);
+        if (noKey.length) {
+            error = updateError(error, "No primary key constraint found for the following:", noKey);
+        }
+        if (invalidCol.length) {
+            const invalidCols = Object.values(InvalidColumns).join(", ");
+            error = updateError(error, `Cannot use columns ${invalidCols} found in following:`, invalidCol);
         }
-        return { tables: connector.tables, error };
-    });
-}
+    }
+    return { tables: connector.tables, error };
+});

package/dist/api/controllers/deploy/Deployment.js

@@ -1,16 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const newid_1 = __importDefault(require("../../../db/newid"));
-const backend_core_1 = require("@budibase/backend-core");
+const newid = require("../../../db/newid");
+const { getAppId } = require("@budibase/backend-core/context");
 /**
  * This is used to pass around information about the deployment that is occurring
  */
 class Deployment {
     constructor(id = null) {
-        this._id = id || (0, newid_1.default)();
+        this._id = id || newid();
     }
     setVerification(verification) {
         if (!verification) {
@@ -21,7 +17,7 @@ class Deployment {
     getVerification() {
         return this.verification;
     }
-    setStatus(status, err) {
+    setStatus(status, err = null) {
         this.status = status;
         if (err) {
             this.err = err;
@@ -38,7 +34,7 @@ class Deployment {
     getJSON() {
         const obj = {
             _id: this._id,
-            appId: backend_core_1.context.getAppId(),
+            appId: getAppId(),
             status: this.status,
         };
         if (this.err) {
@@ -50,4 +46,4 @@ class Deployment {
         return obj;
     }
 }
-exports.default = Deployment;
+module.exports = Deployment;

package/dist/api/controllers/deploy/index.js

@@ -14,9 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployApp = exports.deploymentProgress = exports.fetchDeployments = void 0;
 const Deployment_1 = __importDefault(require("./Deployment"));
-const backend_core_1 = require("@budibase/backend-core");
+const db_1 = require("@budibase/backend-core/db");
 const utils_1 = require("../../../db/utils");
 const utils_2 = require("../../../automations/utils");
+const cache_1 = require("@budibase/backend-core/cache");
+const context_1 = require("@budibase/backend-core/context");
+const backend_core_1 = require("@budibase/backend-core");
 const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 // the max time we can wait for an invalidation to complete before considering it failed
@@ -46,7 +49,7 @@ function checkAllDeployments(deployments) {
 function storeDeploymentHistory(deployment) {
     return __awaiter(this, void 0, void 0, function* () {
         const deploymentJSON = deployment.getJSON();
-        const db = backend_core_1.context.getAppDB();
+        const db = (0, context_1.getAppDB)();
         let deploymentDoc;
         try {
             // theres only one deployment doc per app database
@@ -67,7 +70,7 @@ function storeDeploymentHistory(deployment) {
 }
 function initDeployedApp(prodAppId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getProdAppDB();
+        const db = (0, context_1.getProdAppDB)();
         console.log("Reading automation docs");
         const automations = (yield db.allDocs((0, utils_1.getAutomationParams)(null, {
             include_docs: true,
@@ -90,9 +93,9 @@ function deployApp(deployment, userId) {
     return __awaiter(this, void 0, void 0, function* () {
         let replication;
         try {
-            const appId = backend_core_1.context.getAppId();
-            const devAppId = backend_core_1.db.getDevelopmentAppID(appId);
-            const productionAppId = backend_core_1.db.getProdAppID(appId);
+            const appId = (0, context_1.getAppId)();
+            const devAppId = (0, db_1.getDevelopmentAppID)(appId);
+            const productionAppId = (0, db_1.getProdAppID)(appId);
             // don't try this if feature isn't allowed, will error
             if (yield pro_1.backups.isEnabled()) {
                 // trigger backup initially
@@ -104,8 +107,8 @@ function deployApp(deployment, userId) {
                 source: devAppId,
                 target: productionAppId,
             };
-            replication = new backend_core_1.db.Replication(config);
-            const devDb = backend_core_1.context.getDevAppDB();
+            replication = new db_1.Replication(config);
+            const devDb = (0, context_1.getDevAppDB)();
             console.log("Compacting development DB");
             yield devDb.compact();
             console.log("Replication object created");
@@ -113,7 +116,7 @@ function deployApp(deployment, userId) {
             console.log("replication complete.. replacing app meta doc");
             // app metadata is excluded as it is likely to be in conflict
             // replicate the app metadata document manually
-            const db = backend_core_1.context.getProdAppDB();
+            const db = (0, context_1.getProdAppDB)();
             const appDoc = yield devDb.get(utils_1.DocumentType.APP_METADATA);
             try {
                 const prodAppDoc = yield db.get(utils_1.DocumentType.APP_METADATA);
@@ -129,7 +132,7 @@ function deployApp(deployment, userId) {
             // remove automation errors if they exist
             delete appDoc.automationErrors;
             yield db.put(appDoc);
-            yield backend_core_1.cache.app.invalidateAppMetadata(productionAppId);
+            yield cache_1.app.invalidateAppMetadata(productionAppId);
             console.log("New app doc written successfully.");
             yield initDeployedApp(productionAppId);
             console.log("Deployed app initialised, setting deployment to successful");
@@ -152,7 +155,7 @@ function deployApp(deployment, userId) {
 function fetchDeployments(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const db = backend_core_1.context.getAppDB();
+            const db = (0, context_1.getAppDB)();
             const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
             const { updated, deployments } = yield checkAllDeployments(deploymentDoc);
             if (updated) {
@@ -169,7 +172,7 @@ exports.fetchDeployments = fetchDeployments;
 function deploymentProgress(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const db = backend_core_1.context.getAppDB();
+            const db = (0, context_1.getAppDB)();
             const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
             ctx.body = deploymentDoc[ctx.params.deploymentId];
         }
@@ -181,7 +184,7 @@ function deploymentProgress(ctx) {
 exports.deploymentProgress = deploymentProgress;
 const isFirstDeploy = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const db = backend_core_1.context.getProdAppDB();
+        const db = (0, context_1.getProdAppDB)();
         yield db.get(utils_1.DocumentType.APP_METADATA);
     }
     catch (e) {