@budibase/server 1.3.21-alpha.1 → 1.3.21

package/dist/api/controllers/application.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateAppPackage = exports.sync = exports.destroy = exports.revertClient = exports.updateClient = exports.update = exports.create = exports.fetchAppPackage = exports.fetchAppDefinition = exports.fetch = exports.getAppUrl = void 0;
+exports.sync = exports.destroy = exports.revertClient = exports.updateClient = exports.update = exports.create = exports.fetchAppPackage = exports.fetchAppDefinition = exports.fetch = exports.getAppUrl = void 0;
 const environment_1 = __importDefault(require("../../environment"));
 const package_json_1 = __importDefault(require("../../../package.json"));
 const staticViews_1 = require("../../db/views/staticViews");
@@ -353,7 +353,7 @@ const update = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         checkAppUrl(ctx, apps, url, ctx.params.appId);
         ctx.request.body.url = url;
     }
-    const app = yield (0, exports.updateAppPackage)(ctx.request.body, ctx.params.appId);
+    const app = yield updateAppPackage(ctx.request.body, ctx.params.appId);
     yield backend_core_2.events.app.updated(app);
     ctx.status = 200;
     ctx.body = app;
@@ -375,7 +375,7 @@ const updateClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         version: updatedToVersion,
         revertableVersion: currentVersion,
     };
-    const app = yield (0, exports.updateAppPackage)(appPackageUpdates, ctx.params.appId);
+    const app = yield updateAppPackage(appPackageUpdates, ctx.params.appId);
     yield backend_core_2.events.app.versionUpdated(app, currentVersion, updatedToVersion);
     ctx.status = 200;
     ctx.body = app;
@@ -399,7 +399,7 @@ const revertClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         version: revertedToVersion,
         revertableVersion: null,
     };
-    const app = yield (0, exports.updateAppPackage)(appPackageUpdates, ctx.params.appId);
+    const app = yield updateAppPackage(appPackageUpdates, ctx.params.appId);
     yield backend_core_2.events.app.versionReverted(app, currentVersion, revertedToVersion);
     ctx.status = 200;
     ctx.body = app;
@@ -415,6 +415,7 @@ const destroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const app = yield db.get(utils_1.DocumentType.APP_METADATA);
     const result = yield db.destroy();
     if (isUnpublish) {
+        yield pro_1.quotas.removePublishedApp();
         yield backend_core_2.events.app.unpublished(app);
     }
     else {
@@ -526,7 +527,6 @@ const updateAppPackage = (appPackage, appId) => __awaiter(void 0, void 0, void 0
         return newAppPackage;
     }));
 });
-exports.updateAppPackage = updateAppPackage;
 const migrateAppNavigation = () => __awaiter(void 0, void 0, void 0, function* () {
     const db = backend_core_1.context.getAppDB();
     const existing = yield db.get(utils_1.DocumentType.APP_METADATA);

package/dist/api/controllers/auth.js

@@ -13,14 +13,6 @@ const { InternalTables } = require("../../db/utils");
 const { getFullUser } = require("../../utilities/users");
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const { getAppDB, getAppId } = require("@budibase/backend-core/context");
-/**
- * Add the attributes that are session based to the current user.
- */
-const addSessionAttributesToUser = ctx => {
-    if (ctx.user) {
-        ctx.body.license = ctx.user.license;
-    }
-};
 exports.fetchSelf = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     let userId = ctx.user.userId || ctx.user._id;
     /* istanbul ignore next */
@@ -67,5 +59,4 @@ exports.fetchSelf = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     else {
         ctx.body = user;
     }
-    addSessionAttributesToUser(ctx);
 });

package/dist/api/controllers/component.js

@@ -8,10 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { DocumentType, getPluginParams } = require("../../db/utils");
+const { DocumentType } = require("../../db/utils");
 const { getComponentLibraryManifest } = require("../../utilities/fileSystem");
 const { getAppDB } = require("@budibase/backend-core/context");
-const { getGlobalDB } = require("@budibase/backend-core/tenancy");
 exports.fetchAppComponentDefinitions = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -36,18 +35,6 @@ exports.fetchAppComponentDefinitions = function (ctx) {
                     }
                 }
             }
-            // Add custom components
-            const globalDB = getGlobalDB();
-            const response = yield globalDB.allDocs(getPluginParams(null, {
-                include_docs: true,
-            }));
-            response.rows
-                .map(row => row.doc)
-                .filter(plugin => plugin.schema.type === "component")
-                .forEach(plugin => {
-                const fullComponentName = `plugin/${plugin.name}`;
-                definitions[fullComponentName] = Object.assign({ component: fullComponentName }, plugin.schema.schema);
-            });
             ctx.body = definitions;
         }
         catch (err) {

package/dist/api/controllers/datasource.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const { generateDatasourceID, getDatasourceParams, getQueryParams, DocumentType, BudibaseInternalDB, getTableParams, } = require("../../db/utils");
 const { BuildSchemaErrors, InvalidColumns } = require("../../constants");
-const { getIntegration } = require("../../integrations");
+const { integrations } = require("../../integrations");
 const { getDatasourceAndQuery } = require("./row/utils");
 const { invalidateDynamicVariables } = require("../../threads/utils");
 const { getAppDB } = require("@budibase/backend-core/context");
@@ -41,21 +41,8 @@ exports.buildSchemaFromDb = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB();
         const datasource = yield db.get(ctx.params.datasourceId);
-        const tablesFilter = ctx.request.body.tablesFilter;
-        let { tables, error } = yield buildSchemaHelper(datasource);
-        if (tablesFilter) {
-            if (!datasource.entities) {
-                datasource.entities = {};
-            }
-            for (let key in tables) {
-                if (tablesFilter.some(filter => filter.toLowerCase() === key.toLowerCase())) {
-                    datasource.entities[key] = tables[key];
-                }
-            }
-        }
-        else {
-            datasource.entities = tables;
-        }
+        const { tables, error } = yield buildSchemaHelper(datasource);
+        datasource.entities = tables;
         const dbResp = yield db.put(datasource);
         datasource._rev = dbResp.rev;
         const response = { datasource };
@@ -109,7 +96,7 @@ exports.update = function (ctx) {
         datasource._rev = response.rev;
         // Drain connection pools when configuration is changed
         if (datasource.source) {
-            const source = yield getIntegration(datasource.source);
+            const source = integrations[datasource.source];
             if (source && source.pool) {
                 yield source.pool.end();
             }
@@ -136,7 +123,7 @@ exports.save = function (ctx) {
         datasource._rev = dbResp.rev;
         // Drain connection pools when configuration is changed
         if (datasource.source) {
-            const source = yield getIntegration(datasource.source);
+            const source = integrations[datasource.source];
             if (source && source.pool) {
                 yield source.pool.end();
             }
@@ -201,13 +188,13 @@ function updateError(error, newError, tables) {
     return error;
 }
 const buildSchemaHelper = (datasource) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    const Connector = yield getIntegration(datasource.source);
+    const Connector = integrations[datasource.source];
     // Connect to the DB and build the schema
     const connector = new Connector(datasource.config);
     yield connector.buildSchema(datasource._id, datasource.entities);
+    datasource.entities = connector.tables;
     // make sure they all have a display name selected
-    for (let entity of Object.values((_a = datasource.entities) !== null && _a !== void 0 ? _a : {})) {
+    for (let entity of Object.values(datasource.entities)) {
         if (entity.primaryDisplay) {
             continue;
         }

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

@@ -19,6 +19,7 @@ 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 pro_1 = require("@budibase/pro");
 const backend_core_1 = require("@budibase/backend-core");
 // the max time we can wait for an invalidation to complete before considering it failed
 const MAX_PENDING_TIME_MS = 30 * 60000;
@@ -195,7 +196,13 @@ const _deployApp = function (ctx) {
         deployment = yield storeDeploymentHistory(deployment);
         console.log("Stored deployment history");
         console.log("Deploying app...");
-        let app = yield deployApp(deployment);
+        let app;
+        if (yield isFirstDeploy()) {
+            app = yield pro_1.quotas.addPublishedApp(() => deployApp(deployment));
+        }
+        else {
+            app = yield deployApp(deployment);
+        }
         yield backend_core_1.events.app.published(app);
         ctx.body = deployment;
     });

package/dist/api/controllers/integration.js

@@ -8,14 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getDefinitions } = require("../../integrations");
+const { cloneDeep } = require("lodash");
+const { definitions } = require("../../integrations");
 const { SourceName } = require("@budibase/types");
 const googlesheets = require("../../integrations/googlesheets");
 const { featureFlags } = require("@budibase/backend-core");
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         ctx.status = 200;
-        const defs = yield getDefinitions();
+        const defs = cloneDeep(definitions);
         // for google sheets integration google verification
         if (featureFlags.isEnabled(featureFlags.FeatureFlag.GOOGLE_SHEETS)) {
             defs[SourceName.GOOGLE_SHEETS] = googlesheets.schema;
@@ -25,8 +26,7 @@ exports.fetch = function (ctx) {
 };
 exports.find = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const defs = yield getDefinitions();
         ctx.status = 200;
-        ctx.body = defs[ctx.params.type];
+        ctx.body = definitions[ctx.params.type];
     });
 };

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

@@ -63,7 +63,7 @@ exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     });
 });
 exports.fetchView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    // there are no views in external datasources, shouldn't ever be called
+    // there are no views in external data sources, shouldn't ever be called
     // for now just fetch
     const split = ctx.params.viewName.split("all_");
     ctx.params.tableId = split[1] ? split[1] : split[0];

package/dist/api/controllers/screen.js

@@ -8,12 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getScreenParams, generateScreenID, getPluginParams, DocumentType, } = require("../../db/utils");
+const { getScreenParams, generateScreenID } = require("../../db/utils");
 const { AccessController } = require("@budibase/backend-core/roles");
 const { getAppDB } = require("@budibase/backend-core/context");
 const { events } = require("@budibase/backend-core");
-const { getGlobalDB } = require("@budibase/backend-core/tenancy");
-const { updateAppPackage } = require("./application");
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();
     const screens = (yield db.allDocs(getScreenParams(null, {
@@ -30,45 +28,11 @@ exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         eventFn = events.screen.created;
     }
     const response = yield db.put(screen);
-    // Find any custom components being used
-    let pluginNames = [];
-    let pluginAdded = false;
-    findPlugins(screen.props, pluginNames);
-    if (pluginNames.length) {
-        const globalDB = getGlobalDB();
-        const pluginsResponse = yield globalDB.allDocs(getPluginParams(null, {
-            include_docs: true,
-        }));
-        const requiredPlugins = pluginsResponse.rows
-            .map(row => row.doc)
-            .filter(plugin => {
-            return (plugin.schema.type === "component" &&
-                pluginNames.includes(`plugin/${plugin.name}`));
-        });
-        // Update the app metadata
-        const application = yield db.get(DocumentType.APP_METADATA);
-        let usedPlugins = application.usedPlugins || [];
-        requiredPlugins.forEach(plugin => {
-            if (!usedPlugins.find(x => x._id === plugin._id)) {
-                pluginAdded = true;
-                usedPlugins.push({
-                    _id: plugin._id,
-                    name: plugin.name,
-                    version: plugin.version,
-                    jsUrl: plugin.jsUrl,
-                    hash: plugin.hash,
-                });
-            }
-        });
-        if (pluginAdded) {
-            yield updateAppPackage({ usedPlugins }, ctx.appId);
-        }
-    }
     if (eventFn) {
         yield eventFn(screen);
     }
     ctx.message = `Screen ${screen.name} saved.`;
-    ctx.body = Object.assign(Object.assign({}, screen), { _id: response.id, _rev: response.rev, pluginAdded });
+    ctx.body = Object.assign(Object.assign({}, screen), { _id: response.id, _rev: response.rev });
 });
 exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();
@@ -81,17 +45,3 @@ exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     };
     ctx.status = 200;
 });
-const findPlugins = (component, foundPlugins) => {
-    if (!component) {
-        return;
-    }
-    if (component._component.startsWith("plugin")) {
-        if (!foundPlugins.includes(component._component)) {
-            foundPlugins.push(component._component);
-        }
-    }
-    if (!component._children || !component._children.length) {
-        return;
-    }
-    component._children.forEach(child => findPlugins(child, foundPlugins));
-};

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

@@ -113,7 +113,6 @@ const serveApp = function (ctx) {
                 production: env.isProd(),
                 appId,
                 clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
-                usedPlugins: appInfo.usedPlugins,
             });
             const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`);
             ctx.body = yield processString(appHbs, {

package/dist/api/controllers/static/templates/BudibaseApp.svelte

@@ -3,7 +3,6 @@
   export let favicon = ""
 
   export let clientLibPath
-  export let usedPlugins
 </script>
 
 <svelte:head>
@@ -84,15 +83,6 @@
   </script>
   <script type="application/javascript" src={clientLibPath}>
   </script>
-  <!-- Custom components need inserted after the core client library -->
-  <!-- But before loadBudibase is called -->
-  {#if usedPlugins?.length}
-    {#each usedPlugins as plugin}
-      <script
-        type="application/javascript"
-        src={`/plugins/${plugin.jsUrl}`}></script>
-    {/each}
-  {/if}
   <script type="application/javascript">
     if (window.loadBudibase) {
       window.loadBudibase()

package/dist/api/controllers/static/templates/preview.hbs

@@ -66,9 +66,7 @@
         customTheme,
         previewDevice,
         navigation,
-        hiddenComponentIds,
-        usedPlugins,
-        location
+        hiddenComponentIds
       } = parsed
 
       // Set some flags so the app knows we're in the builder
@@ -83,8 +81,6 @@
       window["##BUDIBASE_PREVIEW_DEVICE##"] = previewDevice
       window["##BUDIBASE_PREVIEW_NAVIGATION##"] = navigation
       window["##BUDIBASE_HIDDEN_COMPONENT_IDS##"] = hiddenComponentIds
-      window["##BUDIBASE_USED_PLUGINS##"] = usedPlugins
-      window["##BUDIBASE_LOCATION##"] = location
 
       // Initialise app
       try {

package/dist/api/index.js

@@ -51,8 +51,8 @@ router
     .use(buildTenancyMiddleware(null, null, {
     noTenancyRequired: true,
 }))
-    .use(pro.licensing())
     .use(currentApp)
+    .use(pro.licensing())
     .use(auditLog);
 // error handling middleware
 router.use((ctx, next) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/api/routes/application.js

@@ -30,15 +30,14 @@ const router_1 = __importDefault(require("@koa/router"));
 const controller = __importStar(require("../controllers/application"));
 const authorized_1 = __importDefault(require("../../middleware/authorized"));
 const permissions_1 = require("@budibase/backend-core/permissions");
-const validators_1 = require("./utils/validators");
 const router = new router_1.default();
 router
     .post("/api/applications/:appId/sync", (0, authorized_1.default)(permissions_1.BUILDER), controller.sync)
-    .post("/api/applications", (0, authorized_1.default)(permissions_1.BUILDER), (0, validators_1.applicationValidator)(), controller.create)
+    .post("/api/applications", (0, authorized_1.default)(permissions_1.BUILDER), controller.create)
     .get("/api/applications/:appId/definition", controller.fetchAppDefinition)
     .get("/api/applications", controller.fetch)
     .get("/api/applications/:appId/appPackage", controller.fetchAppPackage)
-    .put("/api/applications/:appId", (0, authorized_1.default)(permissions_1.BUILDER), (0, validators_1.applicationValidator)({ isCreate: false }), controller.update)
+    .put("/api/applications/:appId", (0, authorized_1.default)(permissions_1.BUILDER), controller.update)
     .post("/api/applications/:appId/client/update", (0, authorized_1.default)(permissions_1.BUILDER), controller.updateClient)
     .post("/api/applications/:appId/client/revert", (0, authorized_1.default)(permissions_1.BUILDER), controller.revertClient)
     .delete("/api/applications/:appId", (0, authorized_1.default)(permissions_1.BUILDER), controller.destroy);

package/dist/api/routes/index.js

@@ -30,7 +30,6 @@ const metadata_1 = __importDefault(require("./metadata"));
 const dev_1 = __importDefault(require("./dev"));
 const cloud_1 = __importDefault(require("./cloud"));
 const migrations_1 = __importDefault(require("./migrations"));
-const plugin_1 = __importDefault(require("./plugin"));
 var static_1 = require("./static");
 Object.defineProperty(exports, "staticRoutes", { enumerable: true, get: function () { return __importDefault(static_1).default; } });
 var public_1 = require("./public");
@@ -64,5 +63,4 @@ exports.mainRoutes = [
     table_1.default,
     row_1.default,
     migrations_1.default,
-    plugin_1.default,
 ];

package/dist/api/routes/public/rows.js

@@ -137,7 +137,88 @@ read.push(new Endpoint_1.default("get", "/tables/:tableId/rows/:rowId", rows_1.d
  *       content:
  *         application/json:
  *           schema:
- *             $ref: '#/components/schemas/rowSearch'
+ *             type: object
+ *             required:
+ *               - query
+ *             properties:
+ *               query:
+ *                 type: object
+ *                 properties:
+ *                   allOr:
+ *                     type: boolean
+ *                     description: Specifies that a row should be returned if it satisfies
+ *                       any of the specified options, rather than requiring it to fulfill all
+ *                       the search parameters. This defaults to false, meaning AND logic will be used.
+ *                   string:
+ *                     type: object
+ *                     example:
+ *                       columnName1: value
+ *                       columnName2: value
+ *                     description: A map of field name to the string to search for,
+ *                       this will look for rows that have a value starting with the
+ *                       string value.
+ *                     additionalProperties:
+ *                       type: string
+ *                       description: The value to search for in the column.
+ *                   fuzzy:
+ *                     type: object
+ *                     description: A fuzzy search, only supported by internal tables.
+ *                   range:
+ *                     type: object
+ *                     description: Searches within a range, the format of this must be
+ *                       in the format of an object with a "low" and "high" property.
+ *                     example:
+ *                       columnName1: { low: 10, high: 20 }
+ *                   equal:
+ *                     type: object
+ *                     description: Searches for rows that have a column value that is
+ *                       exactly the value set.
+ *                   notEqual:
+ *                     type: object
+ *                     description: Searches for any row which does not contain the specified
+ *                       column value.
+ *                   empty:
+ *                     type: object
+ *                     description: Searches for rows which do not contain the specified column.
+ *                       The object should simply contain keys of the column names, these
+ *                       can map to any value.
+ *                     example:
+ *                       columnName1: ""
+ *                   notEmpty:
+ *                     type: object
+ *                     description: Searches for rows which have the specified column.
+ *                   oneOf:
+ *                     type: object
+ *                     description: Searches for rows which have a column value that is any
+ *                       of the specified values. The format of this must be columnName -> [value1, value2].
+ *               paginate:
+ *                 type: boolean
+ *                 description: Enables pagination, by default this is disabled.
+ *               bookmark:
+ *                 oneOf:
+ *                   - type: string
+ *                   - type: integer
+ *                 description: If retrieving another page, the bookmark from the previous request must be supplied.
+ *               limit:
+ *                 type: integer
+ *                 description: The maximum number of rows to return, useful when paginating, for internal tables this
+ *                   will be limited to 1000, for SQL tables it will be 5000.
+ *               sort:
+ *                 type: object
+ *                 description: A set of parameters describing the sort behaviour of the search.
+ *                 properties:
+ *                   order:
+ *                     type: string
+ *                     enum: [ascending, descending]
+ *                     description: The order of the sort, by default this is ascending.
+ *                   column:
+ *                     type: string
+ *                     description: The name of the column by which the rows will be sorted.
+ *                   type:
+ *                     type: string
+ *                     enum: [string, number]
+ *                     description: Defines whether the column should be treated as a string
+ *                       or as numbers when sorting.
  *     responses:
  *       200:
  *         description: The response will contain an array of rows that match the search parameters.

package/dist/api/routes/public/tables.js

@@ -28,7 +28,7 @@ const read = [], write = [];
  *     responses:
  *       200:
  *         description: Returns the created table, including the ID which has been generated for it. This can be
- *           internal or external datasources.
+ *           internal or external data sources.
  *         content:
  *           application/json:
  *             schema:

package/dist/api/routes/table.js

@@ -45,7 +45,7 @@ router
      * @apiParam (Body) {string} [_rev] If updating an existing internal table then the revision must also be specified.
      * @apiParam (Body) {string} type] This should either be "internal" or "external" depending on the table type -
      * this will default to internal.
-     * @apiParam (Body) {string} [sourceId] If creating an external table then this should be set to the datasource ID. If
+     * @apiParam (Body) {string} [sourceId] If creating an external table then this should be set to the data source ID. If
      * building an internal table this does not need to be set, although it will be returned as "bb_internal".
      * @apiParam (Body) {string} name The name of the table, this will be used in the UI. To rename the table simply
      * supply the table structure to this endpoint with the name changed.

package/dist/api/routes/utils/validators.js

@@ -7,7 +7,6 @@ const Joi = require("joi");
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("");
 const OPTIONAL_NUMBER = Joi.number().optional().allow(null);
 const OPTIONAL_BOOLEAN = Joi.boolean().optional().allow(null);
-const APP_NAME_REGEX = /^[\w\s]+$/;
 exports.tableValidator = () => {
     // prettier-ignore
     return joiValidator.body(Joi.object({
@@ -191,29 +190,12 @@ exports.automationValidator = (existing = false) => {
         }).required().unknown(true),
     }).unknown(true));
 };
-exports.applicationValidator = (opts = { isCreate: true }) => {
+exports.applicationValidator = () => {
     // prettier-ignore
-    const base = {
-        _id: OPTIONAL_STRING,
-        _rev: OPTIONAL_STRING,
-        url: OPTIONAL_STRING,
-        template: Joi.object({
-            templateString: OPTIONAL_STRING,
-        })
-    };
-    const appNameValidator = Joi.string()
-        .pattern(new RegExp(APP_NAME_REGEX))
-        .error(new Error("App name must be letters, numbers and spaces only"));
-    if (opts.isCreate) {
-        base.name = appNameValidator.required();
-    }
-    else {
-        base.name = appNameValidator.optional();
-    }
     return joiValidator.body(Joi.object({
         _id: OPTIONAL_STRING,
         _rev: OPTIONAL_STRING,
-        name: appNameValidator,
+        name: Joi.string().required(),
         url: OPTIONAL_STRING,
         template: Joi.object({
             templateString: OPTIONAL_STRING,

package/dist/app.js

@@ -60,13 +60,10 @@ const bullboard = require("./automations/bullboard");
 const { logAlert } = require("@budibase/backend-core/logging");
 const { pinoSettings } = require("@budibase/backend-core");
 const { Thread } = require("./threads");
-const fs = require("fs");
 const redis_1 = __importDefault(require("./utilities/redis"));
 const migrations = __importStar(require("./migrations"));
 const backend_core_1 = require("@budibase/backend-core");
 const workerRequests_1 = require("./utilities/workerRequests");
-const watch_1 = require("./watch");
-const websocket_1 = require("./websocket");
 const app = new Koa();
 // set up top level koa middleware
 app.use(koaBody({
@@ -100,7 +97,6 @@ if (env.isProd()) {
 }
 const server = http.createServer(app.callback());
 destroyable(server);
-(0, websocket_1.initialise)(server);
 let shuttingDown = false, errCode = 0;
 server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
     // already in process
@@ -145,11 +141,7 @@ module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, vo
         if (!((_a = checklist === null || checklist === void 0 ? void 0 : checklist.adminUser) === null || _a === void 0 ? void 0 : _a.checked)) {
             try {
                 const tenantId = backend_core_1.tenancy.getTenantId();
-                const user = yield (0, workerRequests_1.createAdminUser)(env.BB_ADMIN_USER_EMAIL, env.BB_ADMIN_USER_PASSWORD, tenantId);
-                // Need to set up an API key for automated integration tests
-                if (env.isTest()) {
-                    yield (0, workerRequests_1.generateApiKey)(user._id);
-                }
+                yield (0, workerRequests_1.createAdminUser)(env.BB_ADMIN_USER_EMAIL, env.BB_ADMIN_USER_PASSWORD, tenantId);
                 console.log("Admin account automatically created for", env.BB_ADMIN_USER_EMAIL);
             }
             catch (e) {
@@ -158,13 +150,6 @@ module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, vo
             }
         }
     }
-    // monitor plugin directory if required
-    if (env.SELF_HOSTED &&
-        !env.MULTI_TENANCY &&
-        env.PLUGINS_DIR &&
-        fs.existsSync(env.PLUGINS_DIR)) {
-        (0, watch_1.watch)();
-    }
     // check for version updates
     yield backend_core_1.installation.checkInstallVersion();
     // done last - this will never complete

package/dist/db/utils.js

@@ -7,7 +7,7 @@ const AppStatus = {
     ALL: "all",
     DEPLOYED: "published",
 };
-const DocumentType = Object.assign(Object.assign({}, CoreDocTypes), { TABLE: "ta", ROW: "ro", USER: "us", AUTOMATION: "au", LINK: "li", WEBHOOK: "wh", INSTANCE: "inst", LAYOUT: "layout", SCREEN: "screen", DATASOURCE: "datasource", DATASOURCE_PLUS: "datasource_plus", QUERY: "query", DEPLOYMENTS: "deployments", METADATA: "metadata", MEM_VIEW: "view", USER_FLAG: "flag", AUTOMATION_METADATA: "meta_au", PLUGIN: "plg" });
+const DocumentType = Object.assign(Object.assign({}, CoreDocTypes), { TABLE: "ta", ROW: "ro", USER: "us", AUTOMATION: "au", LINK: "li", WEBHOOK: "wh", INSTANCE: "inst", LAYOUT: "layout", SCREEN: "screen", DATASOURCE: "datasource", DATASOURCE_PLUS: "datasource_plus", QUERY: "query", DEPLOYMENTS: "deployments", METADATA: "metadata", MEM_VIEW: "view", USER_FLAG: "flag", AUTOMATION_METADATA: "meta_au" });
 const InternalTables = {
     USER_METADATA: "ta_users",
 };
@@ -274,9 +274,6 @@ exports.generateMemoryViewID = viewName => {
 exports.getMemoryViewParams = (otherProps = {}) => {
     return getDocParams(DocumentType.MEM_VIEW, null, otherProps);
 };
-exports.generatePluginID = name => {
-    return `${DocumentType.PLUGIN}${SEPARATOR}${name}`;
-};
 /**
  * This can be used with the db.allDocs to get a list of IDs
  */
@@ -286,9 +283,3 @@ exports.getMultiIDParams = ids => {
         include_docs: true,
     };
 };
-/**
- * Gets parameters for retrieving automations, this is a utility function for the getDocParams function.
- */
-exports.getPluginParams = (pluginId = null, otherProps = {}) => {
-    return getDocParams(DocumentType.PLUGIN, pluginId, otherProps);
-};

package/dist/environment.js

@@ -64,7 +64,6 @@ module.exports = {
     SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
     BB_ADMIN_USER_EMAIL: process.env.BB_ADMIN_USER_EMAIL,
     BB_ADMIN_USER_PASSWORD: process.env.BB_ADMIN_USER_PASSWORD,
-    PLUGINS_DIR: process.env.PLUGINS_DIR || "/plugins",
     // flags
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
     DISABLE_THREADING: process.env.DISABLE_THREADING,