@budibase/server 2.1.32-alpha.5 → 2.1.32-alpha.7

package/dist/api/controllers/datasource.js

@@ -8,20 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { generateDatasourceID, getDatasourceParams, getQueryParams, DocumentType, BudibaseInternalDB, getTableParams, } = require("../../db/utils");
-const { destroy: tableDestroy } = require("./table/internal");
-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");
-const { db: dbCore } = require("@budibase/backend-core");
-exports.fetch = function (ctx) {
+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) {
     return __awaiter(this, void 0, void 0, function* () {
         // Get internal tables
-        const db = getAppDB();
-        const internalTables = yield db.allDocs(getTableParams(null, {
+        const db = backend_core_1.context.getAppDB();
+        const internalTables = yield db.allDocs((0, utils_1.getTableParams)(null, {
             include_docs: true,
         }));
         const internal = internalTables.rows.reduce((acc, row) => {
@@ -30,9 +30,9 @@ exports.fetch = function (ctx) {
             acc[sourceId].push(row.doc);
             return acc;
         }, {});
-        const bbInternalDb = Object.assign({}, BudibaseInternalDB);
+        const bbInternalDb = Object.assign({}, utils_1.BudibaseInternalDB);
         // Get external datasources
-        const datasources = (yield db.allDocs(getDatasourceParams(null, {
+        const datasources = (yield db.allDocs((0, utils_1.getDatasourceParams)(null, {
             include_docs: true,
         }))).rows.map(row => row.doc);
         const allDatasources = [bbInternalDb, ...datasources];
@@ -41,16 +41,17 @@ exports.fetch = function (ctx) {
                 // strip secrets from response so they don't show in the network request
                 delete datasource.config.auth;
             }
-            if (datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE) {
+            if (datasource.type === backend_core_1.db.BUDIBASE_DATASOURCE_TYPE) {
                 datasource.entities = internal[datasource._id];
             }
         }
         ctx.body = [bbInternalDb, ...datasources];
     });
-};
-exports.buildSchemaFromDb = function (ctx) {
+}
+exports.fetch = fetch;
+function buildSchemaFromDb(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = backend_core_1.context.getAppDB();
         const datasource = yield db.get(ctx.params.datasourceId);
         const tablesFilter = ctx.request.body.tablesFilter;
         let { tables, error } = yield buildSchemaHelper(datasource);
@@ -59,7 +60,7 @@ exports.buildSchemaFromDb = function (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];
                 }
             }
@@ -76,13 +77,14 @@ exports.buildSchemaFromDb = function (ctx) {
         }
         ctx.body = response;
     });
-};
+}
+exports.buildSchemaFromDb = buildSchemaFromDb;
 /**
  * Make sure all datasource entities have a display name selected
  */
-const setDefaultDisplayColumns = datasource => {
+function setDefaultDisplayColumns(datasource) {
     //
-    for (let entity of Object.values(datasource.entities)) {
+    for (let entity of Object.values(datasource.entities || {})) {
         if (entity.primaryDisplay) {
             continue;
         }
@@ -91,37 +93,40 @@ const setDefaultDisplayColumns = datasource => {
             entity.primaryDisplay = notAutoColumn.name;
         }
     }
-};
+}
 /**
  * Check for variables that have been updated or removed and invalidate them.
  */
-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) {
+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) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = backend_core_1.context.getAppDB();
         const datasourceId = ctx.params.datasourceId;
         let datasource = yield db.get(datasourceId);
         const auth = datasource.config.auth;
@@ -132,11 +137,11 @@ exports.update = function (ctx) {
             datasource.config.auth = auth;
         }
         const response = yield db.put(datasource);
-        yield events.datasource.updated(datasource);
+        yield backend_core_1.events.datasource.updated(datasource);
         datasource._rev = response.rev;
         // Drain connection pools when configuration is changed
         if (datasource.source) {
-            const source = yield getIntegration(datasource.source);
+            const source = yield (0, integrations_1.getIntegration)(datasource.source);
             if (source && source.pool) {
                 yield source.pool.end();
             }
@@ -145,13 +150,14 @@ exports.update = function (ctx) {
         ctx.message = "Datasource saved successfully.";
         ctx.body = { datasource };
     });
-};
-exports.save = function (ctx) {
+}
+exports.update = update;
+function save(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = backend_core_1.context.getAppDB();
         const plus = ctx.request.body.datasource.plus;
         const fetchSchema = ctx.request.body.fetchSchema;
-        const datasource = Object.assign({ _id: generateDatasourceID({ plus }), type: plus ? DocumentType.DATASOURCE_PLUS : DocumentType.DATASOURCE }, ctx.request.body.datasource);
+        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);
         let schemaError = null;
         if (fetchSchema) {
             const { tables, error } = yield buildSchemaHelper(datasource);
@@ -160,11 +166,11 @@ exports.save = function (ctx) {
             setDefaultDisplayColumns(datasource);
         }
         const dbResp = yield db.put(datasource);
-        yield events.datasource.created(datasource);
+        yield backend_core_1.events.datasource.created(datasource);
         datasource._rev = dbResp.rev;
         // Drain connection pools when configuration is changed
         if (datasource.source) {
-            const source = yield getIntegration(datasource.source);
+            const source = yield (0, integrations_1.getIntegration)(datasource.source);
             if (source && source.pool) {
                 yield source.pool.end();
             }
@@ -175,41 +181,44 @@ exports.save = function (ctx) {
         }
         ctx.body = response;
     });
-};
-const destroyInternalTablesBySourceId = (datasourceId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
-    // Get all internal tables
-    const internalTables = yield db.allDocs(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);
+}
+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,
+                },
+            });
         }
-        return acc;
-    }, []);
-    // Destroy the tables.
-    for (const table of datasourceTableDocs) {
-        yield tableDestroy({
-            params: {
-                tableId: table._id,
-            },
-        });
-    }
-});
-exports.destroy = function (ctx) {
+    });
+}
+function destroy(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = backend_core_1.context.getAppDB();
         const datasourceId = ctx.params.datasourceId;
         const datasource = yield db.get(datasourceId);
         // Delete all queries for the datasource
-        if (datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE) {
+        if (datasource.type === backend_core_1.db.BUDIBASE_DATASOURCE_TYPE) {
             yield destroyInternalTablesBySourceId(datasourceId);
         }
         else {
-            const queries = yield db.allDocs(getQueryParams(datasourceId, null));
-            yield db.bulkDocs(queries.rows.map(row => ({
+            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,
@@ -217,29 +226,32 @@ exports.destroy = function (ctx) {
         }
         // delete the datasource
         yield db.remove(datasourceId, ctx.params.revId);
-        yield events.datasource.deleted(datasource);
+        yield backend_core_1.events.datasource.deleted(datasource);
         ctx.message = `Datasource deleted.`;
         ctx.status = 200;
     });
-};
-exports.find = function (ctx) {
+}
+exports.destroy = destroy;
+function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const database = getAppDB();
+        const database = backend_core_1.context.getAppDB();
         ctx.body = yield database.get(ctx.params.datasourceId);
     });
-};
+}
+exports.find = find;
 // dynamic query functionality
-exports.query = function (ctx) {
+function query(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const queryJson = ctx.request.body;
         try {
-            ctx.body = yield getDatasourceAndQuery(queryJson);
+            ctx.body = yield (0, utils_2.getDatasourceAndQuery)(queryJson);
         }
         catch (err) {
             ctx.throw(400, err);
         }
     });
-};
+}
+exports.query = query;
 function getErrorTables(errors, errorType) {
     return Object.entries(errors)
         .filter(entry => entry[1] === errorType)
@@ -255,23 +267,25 @@ function updateError(error, newError, tables) {
     error += `${newError} ${tables.join(", ")}`;
     return error;
 }
-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);
+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);
+            }
         }
-    }
-    return { tables: connector.tables, error };
-});
+        return { tables: connector.tables, error };
+    });
+}

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

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

package/dist/api/controllers/layout.js

@@ -8,39 +8,42 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { EMPTY_LAYOUT } = require("../../constants/layouts");
-const { generateLayoutID, getScreenParams } = require("../../db/utils");
-const { getAppDB } = require("@budibase/backend-core/context");
-const { events } = require("@budibase/backend-core");
-exports.save = function (ctx) {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.destroy = exports.save = void 0;
+const layouts_1 = require("../../constants/layouts");
+const utils_1 = require("../../db/utils");
+const backend_core_1 = require("@budibase/backend-core");
+function save(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = backend_core_1.context.getAppDB();
         let layout = ctx.request.body;
         if (!layout.props) {
-            layout = Object.assign(Object.assign({}, EMPTY_LAYOUT), layout);
+            layout = Object.assign(Object.assign({}, layouts_1.EMPTY_LAYOUT), layout);
             layout.props._instanceName = layout.name;
         }
-        layout._id = layout._id || generateLayoutID();
+        layout._id = layout._id || (0, utils_1.generateLayoutID)();
         const response = yield db.put(layout);
-        yield events.layout.created(layout);
+        yield backend_core_1.events.layout.created(layout);
         layout._rev = response.rev;
         ctx.body = layout;
         ctx.status = 200;
     });
-};
-exports.destroy = function (ctx) {
+}
+exports.save = save;
+function destroy(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = backend_core_1.context.getAppDB();
         const layoutId = ctx.params.layoutId, layoutRev = ctx.params.layoutRev;
-        const layoutsUsedByScreens = (yield db.allDocs(getScreenParams(null, {
+        const layoutsUsedByScreens = (yield db.allDocs((0, utils_1.getScreenParams)(null, {
             include_docs: true,
         }))).rows.map(element => element.doc.layoutId);
         if (layoutsUsedByScreens.includes(layoutId)) {
             ctx.throw(400, "Cannot delete a layout that's being used by a screen");
         }
         yield db.remove(layoutId, layoutRev);
-        yield events.layout.deleted(layoutId);
+        yield backend_core_1.events.layout.deleted(layoutId);
         ctx.body = { message: "Layout deleted successfully" };
         ctx.status = 200;
     });
-};
+}
+exports.destroy = destroy;

package/dist/api/controllers/metadata.js

@@ -8,42 +8,56 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { MetadataTypes } = require("../../constants");
-const { generateMetadataID } = require("../../db/utils");
-const { saveEntityMetadata, deleteEntityMetadata } = require("../../utilities");
-const { getAppDB } = require("@budibase/backend-core/context");
-exports.getTypes = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    ctx.body = {
-        types: MetadataTypes,
-    };
-});
-exports.saveMetadata = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { type, entityId } = ctx.params;
-    if (type === MetadataTypes.AUTOMATION_TEST_HISTORY) {
-        ctx.throw(400, "Cannot save automation history type");
-    }
-    ctx.body = yield saveEntityMetadata(type, entityId, ctx.request.body);
-});
-exports.deleteMetadata = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { type, entityId } = ctx.params;
-    yield deleteEntityMetadata(type, entityId);
-    ctx.body = {
-        message: "Metadata deleted successfully",
-    };
-});
-exports.getMetadata = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { type, entityId } = ctx.params;
-    const db = getAppDB();
-    const id = generateMetadataID(type, entityId);
-    try {
-        ctx.body = yield db.get(id);
-    }
-    catch (err) {
-        if (err.status === 404) {
-            ctx.body = {};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMetadata = exports.deleteMetadata = exports.saveMetadata = exports.getTypes = void 0;
+const constants_1 = require("../../constants");
+const utils_1 = require("../../db/utils");
+const utilities_1 = require("../../utilities");
+const backend_core_1 = require("@budibase/backend-core");
+function getTypes(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        ctx.body = {
+            types: constants_1.MetadataTypes,
+        };
+    });
+}
+exports.getTypes = getTypes;
+function saveMetadata(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { type, entityId } = ctx.params;
+        if (type === constants_1.MetadataTypes.AUTOMATION_TEST_HISTORY) {
+            ctx.throw(400, "Cannot save automation history type");
         }
-        else {
-            ctx.throw(err.status, err);
+        ctx.body = yield (0, utilities_1.saveEntityMetadata)(type, entityId, ctx.request.body);
+    });
+}
+exports.saveMetadata = saveMetadata;
+function deleteMetadata(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { type, entityId } = ctx.params;
+        yield (0, utilities_1.deleteEntityMetadata)(type, entityId);
+        ctx.body = {
+            message: "Metadata deleted successfully",
+        };
+    });
+}
+exports.deleteMetadata = deleteMetadata;
+function getMetadata(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { type, entityId } = ctx.params;
+        const db = backend_core_1.context.getAppDB();
+        const id = (0, utils_1.generateMetadataID)(type, entityId);
+        try {
+            ctx.body = yield db.get(id);
         }
-    }
-});
+        catch (err) {
+            if (err.status === 404) {
+                ctx.body = {};
+            }
+            else {
+                ctx.throw(err.status, err);
+            }
+        }
+    });
+}
+exports.getMetadata = getMetadata;