@budibase/server 1.0.200-alpha.3 → 1.0.200

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

@@ -19,11 +19,10 @@ const env = require("../../../environment");
 const { clientLibraryPath } = require("../../../utilities");
 const { upload } = require("../../../utilities/fileSystem");
 const { attachmentsRelativeURL } = require("../../../utilities");
-const { DocumentTypes, isDevAppID } = require("../../../db/utils");
+const { DocumentTypes } = require("../../../db/utils");
 const { getAppDB, getAppId } = require("@budibase/backend-core/context");
 const AWS = require("aws-sdk");
 const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1";
-const { events } = require("@budibase/backend-core");
 function prepareUpload({ s3Key, bucket, metadata, file }) {
     return __awaiter(this, void 0, void 0, function* () {
         const response = yield upload({
@@ -47,7 +46,6 @@ exports.serveBuilder = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         let builderPath = resolve(TOP_LEVEL_PATH, "builder");
         yield send(ctx, ctx.file, { root: builderPath });
-        yield events.serve.servedBuilder();
     });
 };
 exports.uploadFile = function (ctx) {
@@ -70,35 +68,23 @@ exports.uploadFile = function (ctx) {
 };
 exports.serveApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
+        const App = require("./templates/BudibaseApp.svelte").default;
         const db = getAppDB({ skip_setup: true });
         const appInfo = yield db.get(DocumentTypes.APP_METADATA);
         let appId = getAppId();
-        if (!env.isJest()) {
-            const App = require("./templates/BudibaseApp.svelte").default;
-            const { head, html, css } = App.render({
-                title: appInfo.name,
-                production: env.isProd(),
-                appId,
-                clientLibPath: clientLibraryPath(appId, appInfo.version),
-            });
-            const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`);
-            ctx.body = yield processString(appHbs, {
-                head,
-                body: html,
-                style: css.code,
-                appId,
-            });
-        }
-        else {
-            // just return the app info for jest to assert on
-            ctx.body = appInfo;
-        }
-        if (isDevAppID(appInfo.appId)) {
-            yield events.serve.servedAppPreview(appInfo);
-        }
-        else {
-            yield events.serve.servedApp(appInfo);
-        }
+        const { head, html, css } = App.render({
+            title: appInfo.name,
+            production: env.isProd(),
+            appId,
+            clientLibPath: clientLibraryPath(appId, appInfo.version),
+        });
+        const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`);
+        ctx.body = yield processString(appHbs, {
+            head,
+            body: html,
+            style: css.code,
+            appId,
+        });
     });
 };
 exports.serveClientLibrary = function (ctx) {

package/dist/api/controllers/table/external.js

@@ -16,7 +16,6 @@ const { cloneDeep } = require("lodash/fp");
 const csvParser = require("../../../utilities/csvParser");
 const { handleRequest } = require("../row/external");
 const { getAppDB } = require("@budibase/backend-core/context");
-const { events } = require("@budibase/backend-core");
 function makeTableRequest(datasource, operation, table, tables, oldTable = null, renamed = null) {
     return __awaiter(this, void 0, void 0, function* () {
         const json = {
@@ -248,7 +247,6 @@ exports.bulkImport = function (ctx) {
         yield handleRequest(DataSourceOperation.BULK_CREATE, table._id, {
             rows,
         });
-        yield events.rows.imported(table, "csv", rows.length);
         return table;
     });
 };

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

@@ -15,7 +15,6 @@ const { isExternalTable, isSQL } = require("../../../integrations/utils");
 const { getDatasourceParams } = require("../../../db/utils");
 const { getAppDB } = require("@budibase/backend-core/context");
 const { getTable, getAllInternalTables } = require("./utils");
-const { events } = require("@budibase/backend-core");
 function pickApi({ tableId, table }) {
     if (table && !tableId) {
         tableId = table._id;
@@ -58,17 +57,7 @@ exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.appId;
         const table = ctx.request.body;
-        const importFormat = table.dataImport && table.dataImport.csvString ? "csv" : undefined;
         const savedTable = yield pickApi({ table }).save(ctx);
-        if (!table._id) {
-            yield events.table.created(savedTable);
-        }
-        else {
-            yield events.table.updated(savedTable);
-        }
-        if (importFormat) {
-            yield events.table.imported(savedTable, importFormat);
-        }
         ctx.status = 200;
         ctx.message = `Table ${table.name} saved successfully.`;
         ctx.eventEmitter &&
@@ -81,7 +70,6 @@ exports.destroy = function (ctx) {
         const appId = ctx.appId;
         const tableId = ctx.params.tableId;
         const deletedTable = yield pickApi({ tableId }).destroy(ctx);
-        yield events.table.deleted(deletedTable);
         ctx.eventEmitter &&
             ctx.eventEmitter.emitTable(`table:delete`, appId, deletedTable);
         ctx.status = 200;

package/dist/api/controllers/table/utils.js

@@ -25,7 +25,6 @@ const viewBuilder_1 = __importDefault(require("../view/viewBuilder"));
 const { getAppDB } = require("@budibase/backend-core/context");
 const fp_1 = require("lodash/fp");
 const pro_1 = require("@budibase/pro");
-const backend_core_1 = require("@budibase/backend-core");
 function clearColumns(table, columnNames) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB();
@@ -131,7 +130,8 @@ function handleDataImport(user, table, dataImport) {
             finalData.push(row);
         }
         yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData));
-        yield backend_core_1.events.rows.imported(table, "csv", finalData.length);
+        let response = yield db.put(table);
+        table._rev = response._rev;
         return table;
     });
 }
@@ -220,7 +220,7 @@ class TableSaveFunctions {
     after(table) {
         return __awaiter(this, void 0, void 0, function* () {
             table = yield handleSearchIndexes(table);
-            yield handleDataImport(this.user, table, this.dataImport);
+            table = yield handleDataImport(this.user, table, this.dataImport);
             return table;
         });
     }

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

@@ -27,9 +27,6 @@ const { fetchView } = require("../row");
 const { getTable } = require("../table/utils");
 const { FieldTypes } = require("../../../constants");
 const { getAppDB } = require("@budibase/backend-core/context");
-const { events } = require("@budibase/backend-core");
-const { DocumentTypes } = require("../../../db/utils");
-const { cloneDeep, isEqual } = require("lodash");
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = yield getViews();
 });
@@ -37,70 +34,24 @@ exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();
     const _a = ctx.request.body, { originalName } = _a, viewToSave = __rest(_a, ["originalName"]);
     const view = viewTemplate(viewToSave);
-    const viewName = viewToSave.name;
-    if (!viewName) {
+    if (!viewToSave.name) {
         ctx.throw(400, "Cannot create view without a name");
     }
-    yield saveView(originalName, viewName, view);
+    yield saveView(originalName, viewToSave.name, view);
     // add views to table document
-    const existingTable = yield db.get(ctx.request.body.tableId);
-    const table = cloneDeep(existingTable);
+    const table = yield db.get(ctx.request.body.tableId);
     if (!table.views)
         table.views = {};
     if (!view.meta.schema) {
         view.meta.schema = table.schema;
     }
-    table.views[viewName] = view.meta;
+    table.views[viewToSave.name] = view.meta;
     if (originalName) {
         delete table.views[originalName];
-        existingTable.views[viewName] = existingTable.views[originalName];
     }
     yield db.put(table);
-    yield handleViewEvents(existingTable.views[viewName], table.views[viewName]);
     ctx.body = Object.assign(Object.assign({}, table.views[viewToSave.name]), { name: viewToSave.name });
 });
-const calculationEvents = (existingView, newView) => __awaiter(void 0, void 0, void 0, function* () {
-    const existingCalculation = existingView && existingView.calculation;
-    const newCalculation = newView && newView.calculation;
-    if (existingCalculation && !newCalculation) {
-        yield events.view.calculationDeleted(existingView);
-    }
-    if (!existingCalculation && newCalculation) {
-        yield events.view.calculationCreated(newView);
-    }
-    if (existingCalculation &&
-        newCalculation &&
-        existingCalculation !== newCalculation) {
-        yield events.view.calculationUpdated(newView);
-    }
-});
-const filterEvents = (existingView, newView) => __awaiter(void 0, void 0, void 0, function* () {
-    const hasExistingFilters = !!(existingView &&
-        existingView.filters &&
-        existingView.filters.length);
-    const hasNewFilters = !!(newView && newView.filters && newView.filters.length);
-    if (hasExistingFilters && !hasNewFilters) {
-        yield events.view.filterDeleted(newView);
-    }
-    if (!hasExistingFilters && hasNewFilters) {
-        yield events.view.filterCreated(newView);
-    }
-    if (hasExistingFilters &&
-        hasNewFilters &&
-        !isEqual(existingView.filters, newView.filters)) {
-        yield events.view.filterUpdated(newView);
-    }
-});
-const handleViewEvents = (existingView, newView) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!existingView) {
-        yield events.view.created(newView);
-    }
-    else {
-        yield events.view.updated(newView);
-    }
-    yield calculationEvents(existingView, newView);
-    yield filterEvents(existingView, newView);
-});
 exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();
     const viewName = decodeURI(ctx.params.viewName);
@@ -108,7 +59,6 @@ exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const table = yield db.get(view.meta.tableId);
     delete table.views[viewName];
     yield db.put(table);
-    yield events.view.deleted(view);
     ctx.body = view;
 });
 exports.exportView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
@@ -136,9 +86,9 @@ exports.exportView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     yield fetchView(ctx);
     let rows = ctx.body;
     let schema = view && view.meta && view.meta.schema;
-    const tableId = ctx.params.tableId || view.meta.tableId;
-    const table = yield getTable(tableId);
     if (!schema) {
+        const tableId = ctx.params.tableId || view.meta.tableId;
+        const table = yield getTable(tableId);
         schema = table.schema;
     }
     // remove any relationships
@@ -170,10 +120,4 @@ exports.exportView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     // send down the file
     ctx.attachment(filename);
     ctx.body = apiFileReturn(exporter(headers, rows));
-    if (viewName.startsWith(DocumentTypes.TABLE)) {
-        yield events.table.exported(table, format);
-    }
-    else {
-        yield events.view.exported(table, format);
-    }
 });

package/dist/api/index.js

@@ -68,8 +68,10 @@ router.use((ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
             validationErrors: err.validation,
             error,
         };
-        ctx.log.error(err);
-        console.trace(err);
+        if (env.NODE_ENV !== "jest") {
+            ctx.log.error(err);
+            console.trace(err);
+        }
     }
 }));
 // authenticated routes

package/dist/api/routes/analytics.js

@@ -2,5 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/analytics");
 const router = Router();
-router.get("/api/bbtel", controller.isEnabled);
+router
+    .get("/api/bbtel", controller.isEnabled)
+    .post("/api/bbtel/ping", controller.endUserPing);
 module.exports = router;

package/dist/app.js

@@ -53,7 +53,6 @@ const { logAlert } = require("@budibase/backend-core/logging");
 const { Thread } = require("./threads");
 const redis_1 = __importDefault(require("./utilities/redis"));
 const migrations = __importStar(require("./migrations"));
-const backend_core_1 = require("@budibase/backend-core");
 const app = new Koa();
 // set up top level koa middleware
 app.use(koaBody({
@@ -104,7 +103,6 @@ server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
     }
     yield automations.shutdown();
     yield redis_1.default.shutdown();
-    yield backend_core_1.events.shutdown();
     yield Thread.shutdown();
     api.shutdown();
     if (!env.isTest()) {
@@ -117,20 +115,6 @@ module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, vo
     eventEmitter.emitPort(env.PORT);
     fileSystem.init();
     yield redis_1.default.init();
-    // run migrations on startup if not done via http
-    // not recommended in a clustered environment
-    if (!env.HTTP_MIGRATIONS && !env.isTest()) {
-        try {
-            yield migrations.migrate();
-        }
-        catch (e) {
-            logAlert("Error performing migrations. Exiting.", e);
-            shutdown();
-        }
-    }
-    // check for version updates
-    yield backend_core_1.installation.checkInstallVersion();
-    // done last - this will never complete
     yield automations.init();
 }));
 const shutdown = () => {
@@ -150,3 +134,11 @@ process.on("uncaughtException", err => {
 process.on("SIGTERM", () => {
     shutdown();
 });
+// run migrations on startup if not done via http
+// not recommended in a clustered environment
+if (!env.HTTP_MIGRATIONS) {
+    migrations.migrate().catch(err => {
+        logAlert("Error performing migrations. Exiting.", err);
+        shutdown();
+    });
+}

package/dist/automations/index.js

@@ -10,8 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const { processEvent } = require("./utils");
 const { queue, shutdown } = require("./bullboard");
-const { TRIGGER_DEFINITIONS } = require("./triggers");
-const { ACTION_DEFINITIONS } = require("./actions");
 /**
  * This module is built purely to kick off the worker farm and manage the inputs/outputs
  */
@@ -28,5 +26,3 @@ exports.shutdown = () => {
     return shutdown();
 };
 exports.queue = queue;
-exports.TRIGGER_DEFINITIONS = TRIGGER_DEFINITIONS;
-exports.ACTION_DEFINITIONS = ACTION_DEFINITIONS;

package/dist/automations/steps/executeQuery.js

@@ -88,7 +88,7 @@ exports.run = function ({ inputs, appId, emitter }) {
             },
         });
         try {
-            yield queryController.executeV1(ctx);
+            yield queryController.executeV2(ctx);
             const _b = ctx.body, { data } = _b, rest = __rest(_b, ["data"]);
             return {
                 response: data,

package/dist/environment.js

@@ -1,10 +1,8 @@
 "use strict";
 const { join } = require("path");
 function isTest() {
-    return isCypress() || isJest();
-}
-function isJest() {
     return (process.env.NODE_ENV === "jest" ||
+        process.env.NODE_ENV === "cypress" ||
         (process.env.JEST_WORKER_ID != null &&
             process.env.JEST_WORKER_ID !== "null"));
 }
@@ -59,6 +57,7 @@ module.exports = {
     AUTOMATION_MAX_ITERATIONS: process.env.AUTOMATION_MAX_ITERATIONS,
     SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
     DYNAMO_ENDPOINT: process.env.DYNAMO_ENDPOINT,
+    POSTHOG_TOKEN: process.env.POSTHOG_TOKEN,
     QUERY_THREAD_TIMEOUT: parseIntSafe(process.env.QUERY_THREAD_TIMEOUT),
     SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
     // flags
@@ -75,7 +74,6 @@ module.exports = {
         module.exports[key] = value;
     },
     isTest,
-    isJest,
     isCypress,
     isDev,
     isProd: () => {

package/dist/integrations/firebase.js

@@ -65,7 +65,6 @@ var Firebase;
                         "==",
                         "<",
                         "<=",
-                        "==",
                         "!=",
                         ">=",
                         ">",

package/dist/migrations/index.js

@@ -31,108 +31,44 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrate = exports.MIGRATIONS = exports.buildMigrations = void 0;
-const backend_core_1 = require("@budibase/backend-core");
-const types_1 = require("@budibase/types");
-const environment_1 = __importDefault(require("../environment"));
+exports.migrate = exports.MIGRATIONS = void 0;
+const { MIGRATION_TYPES, runMigrations, } = require("@budibase/backend-core/migrations");
 // migration functions
 const userEmailViewCasing = __importStar(require("./functions/userEmailViewCasing"));
 const quota1 = __importStar(require("./functions/quotas1"));
 const appUrls = __importStar(require("./functions/appUrls"));
 const developerQuota = __importStar(require("./functions/developerQuota"));
 const publishedAppsQuota = __importStar(require("./functions/publishedAppsQuota"));
-const backfill = __importStar(require("./functions/backfill"));
-/**
- * Populate the migration function and additional configuration from
- * the static migration definitions.
- */
-const buildMigrations = () => {
-    const definitions = backend_core_1.migrations.DEFINITIONS;
-    const serverMigrations = [];
-    for (const definition of definitions) {
-        switch (definition.name) {
-            case types_1.MigrationName.USER_EMAIL_VIEW_CASING: {
-                serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: userEmailViewCasing.run }));
-                break;
-            }
-            case types_1.MigrationName.QUOTAS_1: {
-                serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: quota1.run }));
-                break;
-            }
-            case types_1.MigrationName.APP_URLS: {
-                serverMigrations.push(Object.assign(Object.assign({}, definition), { appOpts: { all: true }, fn: appUrls.run }));
-                break;
-            }
-            case types_1.MigrationName.DEVELOPER_QUOTA: {
-                serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: developerQuota.run }));
-                break;
-            }
-            case types_1.MigrationName.PUBLISHED_APP_QUOTA: {
-                serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: publishedAppsQuota.run }));
-                break;
-            }
-            case types_1.MigrationName.EVENT_APP_BACKFILL: {
-                serverMigrations.push(Object.assign(Object.assign({}, definition), { appOpts: { all: true }, fn: backfill.app.run, silent: !!environment_1.default.SELF_HOSTED, preventRetry: !!environment_1.default.SELF_HOSTED }));
-                break;
-            }
-            case types_1.MigrationName.EVENT_GLOBAL_BACKFILL: {
-                serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: backfill.global.run, silent: !!environment_1.default.SELF_HOSTED, preventRetry: !!environment_1.default.SELF_HOSTED }));
-                break;
-            }
-            case types_1.MigrationName.EVENT_INSTALLATION_BACKFILL: {
-                serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: backfill.installation.run, silent: !!environment_1.default.SELF_HOSTED, preventRetry: !!environment_1.default.SELF_HOSTED }));
-                break;
-            }
-        }
-    }
-    return serverMigrations;
-};
-exports.buildMigrations = buildMigrations;
-exports.MIGRATIONS = (0, exports.buildMigrations)();
+exports.MIGRATIONS = [
+    {
+        type: MIGRATION_TYPES.GLOBAL,
+        name: "user_email_view_casing",
+        fn: userEmailViewCasing.run,
+    },
+    {
+        type: MIGRATION_TYPES.GLOBAL,
+        name: "quotas_1",
+        fn: quota1.run,
+    },
+    {
+        type: MIGRATION_TYPES.APP,
+        name: "app_urls",
+        opts: { all: true },
+        fn: appUrls.run,
+    },
+    {
+        type: MIGRATION_TYPES.GLOBAL,
+        name: "developer_quota",
+        fn: developerQuota.run,
+    },
+    {
+        type: MIGRATION_TYPES.GLOBAL,
+        name: "published_apps_quota",
+        fn: publishedAppsQuota.run,
+    },
+];
 const migrate = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    if (environment_1.default.SELF_HOSTED) {
-        // self host runs migrations on startup
-        // make sure only a single instance runs them
-        yield migrateWithLock(options);
-    }
-    else {
-        yield backend_core_1.migrations.runMigrations(exports.MIGRATIONS, options);
-    }
+    yield runMigrations(exports.MIGRATIONS, options);
 });
 exports.migrate = migrate;
-const migrateWithLock = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    // get a new lock client
-    const redlock = yield backend_core_1.redis.clients.getMigrationsRedlock();
-    // lock for 15 minutes
-    const ttl = 1000 * 60 * 15;
-    let migrationLock;
-    // acquire lock
-    try {
-        migrationLock = yield redlock.lock("migrations", ttl);
-    }
-    catch (e) {
-        if (e.name === "LockError") {
-            return;
-        }
-        else {
-            throw e;
-        }
-    }
-    // run migrations
-    try {
-        yield backend_core_1.migrations.runMigrations(exports.MIGRATIONS, options);
-    }
-    finally {
-        // release lock
-        try {
-            yield migrationLock.unlock();
-        }
-        catch (e) {
-            console.error("unable to release migration lock");
-        }
-    }
-});