@budibase/server 1.0.80-alpha.3 → 1.0.80

package/dist/api/controllers/application.js

@@ -220,7 +220,6 @@ exports.create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         tenantId: getTenantId(),
         updatedAt: new Date().toISOString(),
         createdAt: new Date().toISOString(),
-        status: AppStatus.DEV,
     };
     const response = yield db.put(newApplication, { force: true });
     newApplication._rev = response.rev;

package/dist/api/controllers/row/internal.js

@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 const linkRows = require("../../../db/linkedRows");
-const { generateRowID, getRowParams, getTableIDFromRowID, DocumentTypes, InternalTables, } = require("../../../db/utils");
+const { generateRowID, getRowParams, DocumentTypes, InternalTables, } = require("../../../db/utils");
 const userController = require("../user");
 const { inputProcessing, outputProcessing, cleanupAttachments, } = require("../../../utilities/rowProcessor");
 const { FieldTypes } = require("../../../constants");
@@ -358,9 +358,6 @@ exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function*
     // group responses by table
     let groups = {}, tables = {};
     for (let row of response) {
-        if (!row.tableId) {
-            row.tableId = getTableIDFromRowID(row._id);
-        }
         const linkedTableId = row.tableId;
         if (groups[linkedTableId] == null) {
             groups[linkedTableId] = [row];

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

@@ -49,7 +49,7 @@ exports.fetch = function (ctx) {
 };
 exports.find = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const tableId = ctx.params.tableId;
+        const tableId = ctx.params.id;
         ctx.body = yield getTable(tableId);
     });
 };
@@ -73,7 +73,6 @@ exports.destroy = function (ctx) {
         ctx.eventEmitter &&
             ctx.eventEmitter.emitTable(`table:delete`, appId, deletedTable);
         ctx.status = 200;
-        ctx.table = deletedTable;
         ctx.body = { message: `Table ${tableId} deleted.` };
     });
 };

package/dist/api/controllers/webhook.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { generateWebhookID, getWebhookParams } = require("../../db/utils");
 const toJsonSchema = require("to-json-schema");
 const validate = require("jsonschema").validate;
-const { WebhookType } = require("../../constants");
 const triggers = require("../../automations/triggers");
 const { getProdAppID } = require("@budibase/backend-core/db");
 const { getAppDB, updateAppId } = require("@budibase/backend-core/context");
@@ -25,6 +24,9 @@ function Webhook(name, type, target) {
     };
 }
 exports.Webhook = Webhook;
+exports.WebhookType = {
+    AUTOMATION: "automation",
+};
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();
     const response = yield db.allDocs(getWebhookParams(null, {
@@ -60,7 +62,7 @@ exports.buildSchema = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const webhook = yield db.get(ctx.params.id);
     webhook.bodySchema = toJsonSchema(ctx.request.body);
     // update the automation outputs
-    if (webhook.action.type === WebhookType.AUTOMATION) {
+    if (webhook.action.type === exports.WebhookType.AUTOMATION) {
         let automation = yield db.get(webhook.action.target);
         const autoOutputs = automation.definition.trigger.schema.outputs;
         let properties = webhook.bodySchema.properties;
@@ -89,7 +91,7 @@ exports.trigger = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
             validate(ctx.request.body, webhook.bodySchema);
         }
         const target = yield db.get(webhook.action.target);
-        if (webhook.action.type === WebhookType.AUTOMATION) {
+        if (webhook.action.type === exports.WebhookType.AUTOMATION) {
             // trigger with both the pure request and then expand it
             // incase the user has produced a schema to bind to
             yield triggers.externalTrigger(target, Object.assign(Object.assign({ body: ctx.request.body }, ctx.request.body), { appId: prodAppId }));

package/dist/api/index.js

@@ -13,7 +13,7 @@ const { buildAuthMiddleware, auditLog, buildTenancyMiddleware, buildAppTenancyMi
 const currentApp = require("../middleware/currentapp");
 const compress = require("koa-compress");
 const zlib = require("zlib");
-const { mainRoutes, staticRoutes, publicRoutes } = require("./routes");
+const { mainRoutes, staticRoutes } = require("./routes");
 const pkg = require("../../package.json");
 const env = require("../environment");
 const router = new Router();
@@ -76,8 +76,6 @@ for (let route of mainRoutes) {
     router.use(route.routes());
     router.use(route.allowedMethods());
 }
-router.use(publicRoutes.routes());
-router.use(publicRoutes.allowedMethods());
 // WARNING - static routes will catch everything else after them this must be last
 router.use(staticRoutes.routes());
 router.use(staticRoutes.allowedMethods());

package/dist/api/routes/automation.js

@@ -2,19 +2,47 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/automation");
 const authorized = require("../../middleware/authorized");
+const joiValidator = require("../../middleware/joi-validator");
 const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
+const Joi = require("joi");
 const { bodyResource, paramResource } = require("../../middleware/resourceId");
 const { middleware: appInfoMiddleware, AppType, } = require("../../middleware/appInfo");
-const { automationValidator } = require("./utils/validators");
 const router = Router();
+// prettier-ignore
+function generateStepSchema(allowStepTypes) {
+    return Joi.object({
+        stepId: Joi.string().required(),
+        id: Joi.string().required(),
+        description: Joi.string().required(),
+        name: Joi.string().required(),
+        tagline: Joi.string().required(),
+        icon: Joi.string().required(),
+        params: Joi.object(),
+        args: Joi.object(),
+        type: Joi.string().required().valid(...allowStepTypes),
+    }).unknown(true);
+}
+function generateValidator(existing = false) {
+    // prettier-ignore
+    return joiValidator.body(Joi.object({
+        _id: existing ? Joi.string().required() : Joi.string(),
+        _rev: existing ? Joi.string().required() : Joi.string(),
+        name: Joi.string().required(),
+        type: Joi.string().valid("automation").required(),
+        definition: Joi.object({
+            steps: Joi.array().required().items(generateStepSchema(["ACTION", "LOGIC"])),
+            trigger: generateStepSchema(["TRIGGER"]).allow(null),
+        }).required().unknown(true),
+    }).unknown(true));
+}
 router
     .get("/api/automations/trigger/list", authorized(BUILDER), controller.getTriggerList)
     .get("/api/automations/action/list", authorized(BUILDER), controller.getActionList)
     .get("/api/automations/definitions/list", authorized(BUILDER), controller.getDefinitionList)
     .get("/api/automations", authorized(BUILDER), controller.fetch)
     .get("/api/automations/:id", paramResource("id"), authorized(BUILDER), controller.find)
-    .put("/api/automations", bodyResource("_id"), authorized(BUILDER), automationValidator(true), controller.update)
-    .post("/api/automations", authorized(BUILDER), automationValidator(false), controller.create)
+    .put("/api/automations", bodyResource("_id"), authorized(BUILDER), generateValidator(true), controller.update)
+    .post("/api/automations", authorized(BUILDER), generateValidator(false), controller.create)
     .delete("/api/automations/:id/:rev", paramResource("id"), authorized(BUILDER), controller.destroy)
     .post("/api/automations/:id/trigger", appInfoMiddleware({ appType: AppType.PROD }), paramResource("id"), authorized(PermissionTypes.AUTOMATION, PermissionLevels.EXECUTE), controller.trigger)
     .post("/api/automations/:id/test", appInfoMiddleware({ appType: AppType.DEV }), paramResource("id"), authorized(PermissionTypes.AUTOMATION, PermissionLevels.EXECUTE), controller.test);

package/dist/api/routes/datasource.js

@@ -2,15 +2,62 @@
 const Router = require("@koa/router");
 const datasourceController = require("../controllers/datasource");
 const authorized = require("../../middleware/authorized");
+const joiValidator = require("../../middleware/joi-validator");
 const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
-const { datasourceValidator, datasourceQueryValidator, } = require("./utils/validators");
+const Joi = require("joi");
+const { DataSourceOperation } = require("../../constants");
 const router = Router();
+function generateDatasourceSchema() {
+    // prettier-ignore
+    return joiValidator.body(Joi.object({
+        _id: Joi.string(),
+        _rev: Joi.string(),
+        // source: Joi.string().valid("POSTGRES_PLUS"),
+        type: Joi.string().allow("datasource_plus"),
+        relationships: Joi.array().items(Joi.object({
+            from: Joi.string().required(),
+            to: Joi.string().required(),
+            cardinality: Joi.valid("1:N", "1:1", "N:N").required()
+        })),
+        // entities: Joi.array().items(Joi.object({
+        //   type: Joi.string().valid(...Object.values(FieldTypes)).required(),
+        //   name: Joi.string().required(),
+        // })),
+    }).unknown(true));
+}
+function generateQueryDatasourceSchema() {
+    // prettier-ignore
+    return joiValidator.body(Joi.object({
+        endpoint: Joi.object({
+            datasourceId: Joi.string().required(),
+            operation: Joi.string().required().valid(...Object.values(DataSourceOperation)),
+            entityId: Joi.string().required(),
+        }).required(),
+        resource: Joi.object({
+            fields: Joi.array().items(Joi.string()).optional(),
+        }).optional(),
+        body: Joi.object().optional(),
+        sort: Joi.object().optional(),
+        filters: Joi.object({
+            string: Joi.object().optional(),
+            range: Joi.object().optional(),
+            equal: Joi.object().optional(),
+            notEqual: Joi.object().optional(),
+            empty: Joi.object().optional(),
+            notEmpty: Joi.object().optional(),
+        }).optional(),
+        paginate: Joi.object({
+            page: Joi.string().alphanum().optional(),
+            limit: Joi.number().optional(),
+        }).optional(),
+    }));
+}
 router
     .get("/api/datasources", authorized(BUILDER), datasourceController.fetch)
     .get("/api/datasources/:datasourceId", authorized(PermissionTypes.TABLE, PermissionLevels.READ), datasourceController.find)
     .put("/api/datasources/:datasourceId", authorized(PermissionTypes.TABLE, PermissionLevels.READ), datasourceController.update)
-    .post("/api/datasources/query", authorized(PermissionTypes.TABLE, PermissionLevels.READ), datasourceQueryValidator(), datasourceController.query)
+    .post("/api/datasources/query", authorized(PermissionTypes.TABLE, PermissionLevels.READ), generateQueryDatasourceSchema(), datasourceController.query)
     .post("/api/datasources/:datasourceId/schema", authorized(BUILDER), datasourceController.buildSchemaFromDb)
-    .post("/api/datasources", authorized(BUILDER), datasourceValidator(), datasourceController.save)
+    .post("/api/datasources", authorized(BUILDER), generateDatasourceSchema(), datasourceController.save)
     .delete("/api/datasources/:datasourceId/:revId", authorized(BUILDER), datasourceController.destroy);
 module.exports = router;

package/dist/api/routes/index.js

@@ -26,7 +26,6 @@ const metadataRoutes = require("./metadata");
 const devRoutes = require("./dev");
 const cloudRoutes = require("./cloud");
 const migrationRoutes = require("./migrations");
-const publicRoutes = require("./public");
 exports.mainRoutes = [
     authRoutes,
     deployRoutes,
@@ -57,5 +56,4 @@ exports.mainRoutes = [
     rowRoutes,
     migrationRoutes,
 ];
-exports.publicRoutes = publicRoutes;
 exports.staticRoutes = staticRoutes;

package/dist/api/routes/permission.js

@@ -2,16 +2,26 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/permission");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/backend-core/permissions");
-const { permissionValidator } = require("./utils/validators");
+const { BUILDER, PermissionLevels, } = require("@budibase/backend-core/permissions");
+const Joi = require("joi");
+const joiValidator = require("../../middleware/joi-validator");
 const router = Router();
+function generateValidator() {
+    const permLevelArray = Object.values(PermissionLevels);
+    // prettier-ignore
+    return joiValidator.params(Joi.object({
+        level: Joi.string().valid(...permLevelArray).required(),
+        resourceId: Joi.string(),
+        roleId: Joi.string(),
+    }).unknown(true));
+}
 router
     .get("/api/permission/builtin", authorized(BUILDER), controller.fetchBuiltin)
     .get("/api/permission/levels", authorized(BUILDER), controller.fetchLevels)
     .get("/api/permission", authorized(BUILDER), controller.fetch)
     .get("/api/permission/:resourceId", authorized(BUILDER), controller.getResourcePerms)
     // adding a specific role/level for the resource overrides the underlying access control
-    .post("/api/permission/:roleId/:resourceId/:level", authorized(BUILDER), permissionValidator(), controller.addPermission)
+    .post("/api/permission/:roleId/:resourceId/:level", authorized(BUILDER), generateValidator(), controller.addPermission)
     // deleting the level defaults it back the underlying access control for the resource
-    .delete("/api/permission/:roleId/:resourceId/:level", authorized(BUILDER), permissionValidator(), controller.removePermission);
+    .delete("/api/permission/:roleId/:resourceId/:level", authorized(BUILDER), generateValidator(), controller.removePermission);
 module.exports = router;

package/dist/api/routes/role.js

@@ -2,11 +2,27 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/role");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/backend-core/permissions");
-const { roleValidator } = require("./utils/validators");
+const Joi = require("joi");
+const joiValidator = require("../../middleware/joi-validator");
+const { BUILTIN_PERMISSION_IDS, BUILDER, PermissionLevels, } = require("@budibase/backend-core/permissions");
 const router = Router();
+function generateValidator() {
+    const permLevelArray = Object.values(PermissionLevels);
+    // prettier-ignore
+    return joiValidator.body(Joi.object({
+        _id: Joi.string().optional(),
+        _rev: Joi.string().optional(),
+        name: Joi.string().required(),
+        // this is the base permission ID (for now a built in)
+        permissionId: Joi.string().valid(...Object.values(BUILTIN_PERMISSION_IDS)).required(),
+        permissions: Joi.object()
+            .pattern(/.*/, [Joi.string().valid(...permLevelArray)])
+            .optional(),
+        inherits: Joi.string().optional(),
+    }).unknown(true));
+}
 router
-    .post("/api/roles", authorized(BUILDER), roleValidator(), controller.save)
+    .post("/api/roles", authorized(BUILDER), generateValidator(), controller.save)
     .get("/api/roles", authorized(BUILDER), controller.fetch)
     .get("/api/roles/:roleId", authorized(BUILDER), controller.find)
     .delete("/api/roles/:roleId/:rev", authorized(BUILDER), controller.destroy);

package/dist/api/routes/row.js

@@ -5,7 +5,6 @@ const authorized = require("../../middleware/authorized");
 const usage = require("../../middleware/usageQuota");
 const { paramResource, paramSubResource, } = require("../../middleware/resourceId");
 const { PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
-const { internalSearchValidator } = require("./utils/validators");
 const router = Router();
 router
     /**
@@ -98,6 +97,8 @@ router
      *    "notEqual": {},
      *    "empty": {},
      *    "notEmpty": {},
+     *    "contains": {},
+     *    "notContains": {}
      *    "oneOf": {
      *      "columnName": ["value"]
      *    }
@@ -115,7 +116,7 @@ router
      * @apiSuccess {string} bookmark The bookmark to be sent with the next request to get the next
      * page.
      */
-    .post("/api/:tableId/search", internalSearchValidator(), paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.READ), rowController.search)
+    .post("/api/:tableId/search", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.READ), rowController.search)
     // DEPRECATED - this is an old API, but for backwards compat it needs to be
     // supported still
     .post("/api/search/:tableId/rows", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.READ), rowController.search)
@@ -152,7 +153,7 @@ router
      * @apiDescription This endpoint is identical to the row creation endpoint but instead it will
      * error if an _id isn't provided, it will only function for existing rows.
      */
-    .patch("/api/:tableId/rows", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.WRITE), usage, rowController.patch)
+    .patch("/api/:tableId/rows", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.WRITE), rowController.patch)
     /**
      * @api {post} /api/:tableId/rows/validate Validate inputs for a row
      * @apiName Validate inputs for a row

package/dist/api/routes/screen.js

@@ -3,10 +3,31 @@ const Router = require("@koa/router");
 const controller = require("../controllers/screen");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/backend-core/permissions");
-const { screenValidator } = require("./utils/validators");
+const joiValidator = require("../../middleware/joi-validator");
+const Joi = require("joi");
 const router = Router();
+function generateSaveValidation() {
+    // prettier-ignore
+    return joiValidator.body(Joi.object({
+        name: Joi.string().required(),
+        routing: Joi.object({
+            route: Joi.string().required(),
+            roleId: Joi.string().required().allow(""),
+        }).required().unknown(true),
+        props: Joi.object({
+            _id: Joi.string().required(),
+            _component: Joi.string().required(),
+            _children: Joi.array().required(),
+            _instanceName: Joi.string().required(),
+            _styles: Joi.object().required(),
+            type: Joi.string().optional(),
+            table: Joi.string().optional(),
+            layoutId: Joi.string().optional(),
+        }).required().unknown(true),
+    }).unknown(true));
+}
 router
     .get("/api/screens", authorized(BUILDER), controller.fetch)
-    .post("/api/screens", authorized(BUILDER), screenValidator(), controller.save)
+    .post("/api/screens", authorized(BUILDER), generateSaveValidation(), controller.save)
     .delete("/api/screens/:screenId/:screenRev", authorized(BUILDER), controller.destroy);
 module.exports = router;

package/dist/api/routes/table.js

@@ -4,8 +4,22 @@ const tableController = require("../controllers/table");
 const authorized = require("../../middleware/authorized");
 const { paramResource, bodyResource } = require("../../middleware/resourceId");
 const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
-const { tableValidator } = require("./utils/validators");
+const joiValidator = require("../../middleware/joi-validator");
+const Joi = require("joi");
 const router = Router();
+function generateSaveValidator() {
+    // prettier-ignore
+    return joiValidator.body(Joi.object({
+        _id: Joi.string(),
+        _rev: Joi.string(),
+        type: Joi.string().valid("table", "internal", "external"),
+        primaryDisplay: Joi.string(),
+        schema: Joi.object().required(),
+        name: Joi.string().required(),
+        views: Joi.object(),
+        dataImport: Joi.object(),
+    }).unknown(true));
+}
 router
     /**
      * @api {get} /api/tables Fetch all tables
@@ -32,7 +46,7 @@ router
      *
      * @apiSuccess {object[]} body The response body will be the table that was found.
      */
-    .get("/api/tables/:tableId", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.READ), tableController.find)
+    .get("/api/tables/:id", paramResource("id"), authorized(PermissionTypes.TABLE, PermissionLevels.READ), tableController.find)
     /**
      * @api {post} /api/tables Save a table
      * @apiName Save a table
@@ -108,7 +122,7 @@ router
      */
     .post("/api/tables", 
 // allows control over updating a table
-bodyResource("_id"), authorized(BUILDER), tableValidator(), tableController.save)
+bodyResource("_id"), authorized(BUILDER), generateSaveValidator(), tableController.save)
     /**
      * @api {post} /api/tables/csv/validate Validate a CSV for a table
      * @apiName Validate a CSV for a table

package/dist/api/routes/tests/utilities/index.js

@@ -11,17 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const TestConfig = require("../../../../tests/utilities/TestConfiguration");
 const structures = require("../../../../tests/utilities/structures");
 const env = require("../../../../environment");
-function user() {
-    return {
-        _id: "user",
-        _rev: "rev",
-        createdAt: Date.now(),
-        email: "test@test.com",
-        roles: {},
-        tenantId: "default",
-        status: "active",
-    };
-}
 jest.mock("../../../../utilities/workerRequests", () => ({
     getGlobalUsers: jest.fn(() => {
         return {
@@ -33,18 +22,6 @@ jest.mock("../../../../utilities/workerRequests", () => ({
             _id: "us_uuid1",
         };
     }),
-    allGlobalUsers: jest.fn(() => {
-        return [user()];
-    }),
-    readGlobalUser: jest.fn(() => {
-        return user();
-    }),
-    saveGlobalUser: jest.fn(() => {
-        return { _id: "user", _rev: "rev" };
-    }),
-    deleteGlobalUser: jest.fn(() => {
-        return { message: "deleted user" };
-    }),
     removeAppFromUserRoles: jest.fn(),
 }));
 exports.delay = ms => new Promise(resolve => setTimeout(resolve, ms));

package/dist/api/routes/webhook.js

@@ -2,12 +2,27 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/webhook");
 const authorized = require("../../middleware/authorized");
+const joiValidator = require("../../middleware/joi-validator");
 const { BUILDER } = require("@budibase/backend-core/permissions");
-const { webhookValidator } = require("./utils/validators");
+const Joi = require("joi");
 const router = Router();
+function generateSaveValidator() {
+    // prettier-ignore
+    return joiValidator.body(Joi.object({
+        live: Joi.bool(),
+        _id: Joi.string().optional(),
+        _rev: Joi.string().optional(),
+        name: Joi.string().required(),
+        bodySchema: Joi.object().optional(),
+        action: Joi.object({
+            type: Joi.string().required().valid(controller.WebhookType.AUTOMATION),
+            target: Joi.string().required(),
+        }).required(),
+    }).unknown(true));
+}
 router
     .get("/api/webhooks", authorized(BUILDER), controller.fetch)
-    .put("/api/webhooks", authorized(BUILDER), webhookValidator(), controller.save)
+    .put("/api/webhooks", authorized(BUILDER), generateSaveValidator(), controller.save)
     .delete("/api/webhooks/:id/:rev", authorized(BUILDER), controller.destroy)
     .post("/api/webhooks/schema/:instance/:id", authorized(BUILDER), controller.buildSchema)
     // this shouldn't have authorisation, right now its always public

package/dist/automations/steps/filter.js

@@ -23,10 +23,10 @@ const PrettyFilterConditions = {
 exports.FilterConditions = FilterConditions;
 exports.PrettyFilterConditions = PrettyFilterConditions;
 exports.definition = {
-    name: "Condition",
+    name: "Filter",
     tagline: "{{inputs.field}} {{inputs.condition}} {{inputs.value}}",
     icon: "Branch2",
-    description: "Conditionally halt automations which do not meet certain conditions",
+    description: "Filter any automations which do not meet certain conditions",
     type: "LOGIC",
     internal: true,
     stepId: "FILTER",

package/dist/automations/steps/queryRows.js

@@ -81,7 +81,7 @@ function getTable(appId, tableId) {
     return __awaiter(this, void 0, void 0, function* () {
         const ctx = buildCtx(appId, null, {
             params: {
-                tableId,
+                id: tableId,
             },
         });
         yield tableController.find(ctx);

package/dist/automations/utils.js

@@ -15,7 +15,7 @@ const CouchDB = require("../db");
 const { queue } = require("./bullboard");
 const newid = require("../db/newid");
 const { updateEntityMetadata } = require("../utilities");
-const { MetadataTypes, WebhookType } = require("../constants");
+const { MetadataTypes } = require("../constants");
 const { getProdAppID } = require("@budibase/backend-core/db");
 const { cloneDeep } = require("lodash/fp");
 const { getAppDB, getAppId } = require("@budibase/backend-core/context");
@@ -145,7 +145,7 @@ exports.checkForWebhooks = ({ oldAuto, newAuto }) => __awaiter(void 0, void 0, v
         const ctx = {
             appId,
             request: {
-                body: new webhooks.Webhook("Automation webhook", WebhookType.AUTOMATION, newAuto._id),
+                body: new webhooks.Webhook("Automation webhook", webhooks.WebhookType.AUTOMATION, newAuto._id),
             },
         };
         yield webhooks.save(ctx);

package/dist/constants/index.js

@@ -166,8 +166,5 @@ exports.BuildSchemaErrors = {
     NO_KEY: "no_key",
     INVALID_COLUMN: "invalid_column",
 };
-exports.WebhookType = {
-    AUTOMATION: "automation",
-};
 // pass through the list from the auth/core lib
 exports.ObjectStoreBuckets = ObjectStoreBuckets;

package/dist/db/utils.js

@@ -114,17 +114,6 @@ exports.getRowParams = (tableId = null, rowId = null, otherProps = {}) => {
     const endOfKey = rowId == null ? `${tableId}${SEPARATOR}` : rowId;
     return getDocParams(DocumentTypes.ROW, endOfKey, otherProps);
 };
-/**
- * Given a row ID this will find the table ID within it (only works for internal tables).
- * @param {string} rowId The ID of the row.
- * @returns {string} The table ID.
- */
-exports.getTableIDFromRowID = rowId => {
-    const components = rowId
-        .split(DocumentTypes.TABLE + SEPARATOR)[1]
-        .split(SEPARATOR);
-    return `${DocumentTypes.TABLE}${SEPARATOR}${components[0]}`;
-};
 /**
  * Gets a new row ID for the specified table.
  * @param {string} tableId The table which the row is being created for.

package/dist/environment.js

@@ -37,7 +37,6 @@ module.exports = {
     INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
     MULTI_TENANCY: process.env.MULTI_TENANCY,
     HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
-    API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC,
     // environment
     NODE_ENV: process.env.NODE_ENV,
     JEST_WORKER_ID: process.env.JEST_WORKER_ID,

package/dist/integrations/base/sql.js

@@ -232,9 +232,6 @@ class InternalBuilder {
     create(knex, json, opts) {
         const { endpoint, body } = json;
         let query = knex(endpoint.entityId);
-        if (endpoint.schema) {
-            query = query.withSchema(endpoint.schema);
-        }
         const parsedBody = parseBody(body);
         // make sure no null values in body for creation
         for (let [key, value] of Object.entries(parsedBody)) {
@@ -253,9 +250,6 @@ class InternalBuilder {
     bulkCreate(knex, json) {
         const { endpoint, body } = json;
         let query = knex(endpoint.entityId);
-        if (endpoint.schema) {
-            query = query.withSchema(endpoint.schema);
-        }
         if (!Array.isArray(body)) {
             return query;
         }
@@ -263,7 +257,7 @@ class InternalBuilder {
         return query.insert(parsedBody);
     }
     read(knex, json, limit) {
-        let { endpoint, resource, filters, paginate, relationships } = json;
+        let { endpoint, resource, filters, sort, paginate, relationships } = json;
         const tableName = endpoint.entityId;
         // select all if not specified
         if (!resource) {
@@ -291,9 +285,6 @@ class InternalBuilder {
         }
         // start building the query
         let query = knex(tableName).limit(foundLimit);
-        if (endpoint.schema) {
-            query = query.withSchema(endpoint.schema);
-        }
         if (foundOffset) {
             query = query.offset(foundOffset);
         }
@@ -316,9 +307,6 @@ class InternalBuilder {
     update(knex, json, opts) {
         const { endpoint, body, filters } = json;
         let query = knex(endpoint.entityId);
-        if (endpoint.schema) {
-            query = query.withSchema(endpoint.schema);
-        }
         const parsedBody = parseBody(body);
         query = this.addFilters(query, filters, { tableName: endpoint.entityId });
         // mysql can't use returning
@@ -332,9 +320,6 @@ class InternalBuilder {
     delete(knex, json, opts) {
         const { endpoint, filters } = json;
         let query = knex(endpoint.entityId);
-        if (endpoint.schema) {
-            query = query.withSchema(endpoint.schema);
-        }
         query = this.addFilters(query, filters, { tableName: endpoint.entityId });
         // mysql can't use returning
         if (opts.disableReturning) {