@budibase/server 1.3.15-alpha.0 → 1.3.15

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;
@@ -527,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/component.js

@@ -8,11 +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");
-const env = require("../../environment");
 exports.fetchAppComponentDefinitions = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -37,21 +35,6 @@ exports.fetchAppComponentDefinitions = function (ctx) {
                     }
                 }
             }
-            // for now custom components only supported in self-host
-            if (env.SELF_HOSTED) {
-                // 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");
@@ -96,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();
             }
@@ -123,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();
             }
@@ -188,7 +188,7 @@ function updateError(error, newError, tables) {
     return error;
 }
 const buildSchemaHelper = (datasource) => __awaiter(void 0, void 0, void 0, function* () {
-    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);

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/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,44 +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,
-                });
-            }
-        });
-        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();
@@ -80,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,8 +66,7 @@
         customTheme,
         previewDevice,
         navigation,
-        hiddenComponentIds,
-        usedPlugins
+        hiddenComponentIds
       } = parsed
 
       // Set some flags so the app knows we're in the builder
@@ -82,7 +81,6 @@
       window["##BUDIBASE_PREVIEW_DEVICE##"] = previewDevice
       window["##BUDIBASE_PREVIEW_NAVIGATION##"] = navigation
       window["##BUDIBASE_HIDDEN_COMPONENT_IDS##"] = hiddenComponentIds
-      window["##BUDIBASE_USED_PLUGINS##"] = usedPlugins
 
       // Initialise app
       try {

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/app.js

@@ -60,12 +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 app = new Koa();
 // set up top level koa middleware
 app.use(koaBody({
@@ -152,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

@@ -28,8 +28,8 @@ function parseIntSafe(number) {
 }
 let inThread = false;
 module.exports = {
-    // important
-    PORT: process.env.PORT || process.env.APP_PORT,
+    // important - prefer app port to generic port
+    PORT: process.env.APP_PORT || process.env.PORT,
     JWT_SECRET: process.env.JWT_SECRET,
     COUCH_DB_URL: process.env.COUCH_DB_URL,
     MINIO_URL: process.env.MINIO_URL,
@@ -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,

package/dist/integrations/airtable.js

@@ -10,138 +10,141 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
-const Airtable = require("airtable");
-const SCHEMA = {
-    docs: "https://airtable.com/api",
-    description: "Airtable is a spreadsheet-database hybrid, with the features of a database but applied to a spreadsheet.",
-    friendlyName: "Airtable",
-    type: "Spreadsheet",
-    datasource: {
-        apiKey: {
-            type: types_1.DatasourceFieldType.PASSWORD,
-            default: "enter api key",
-            required: true,
-        },
-        base: {
-            type: types_1.DatasourceFieldType.STRING,
-            default: "mybase",
-            required: true,
-        },
-    },
-    query: {
-        create: {
-            type: types_1.QueryType.FIELDS,
-            customisable: true,
-            fields: {
-                table: {
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
+var AirtableModule;
+(function (AirtableModule) {
+    const Airtable = require("airtable");
+    const SCHEMA = {
+        docs: "https://airtable.com/api",
+        description: "Airtable is a spreadsheet-database hybrid, with the features of a database but applied to a spreadsheet.",
+        friendlyName: "Airtable",
+        type: "Spreadsheet",
+        datasource: {
+            apiKey: {
+                type: types_1.DatasourceFieldType.PASSWORD,
+                default: "enter api key",
+                required: true,
             },
-        },
-        read: {
-            type: types_1.QueryType.FIELDS,
-            fields: {
-                table: {
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
-                view: {
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
-                numRecords: {
-                    type: types_1.DatasourceFieldType.NUMBER,
-                    default: 10,
-                },
+            base: {
+                type: types_1.DatasourceFieldType.STRING,
+                default: "mybase",
+                required: true,
             },
         },
-        update: {
-            type: types_1.QueryType.FIELDS,
-            customisable: true,
-            fields: {
-                id: {
-                    display: "Record ID",
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
+        query: {
+            create: {
+                type: types_1.QueryType.FIELDS,
+                customisable: true,
+                fields: {
+                    table: {
+                        type: types_1.DatasourceFieldType.STRING,
+                        required: true,
+                    },
                 },
-                table: {
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
+            },
+            read: {
+                type: types_1.QueryType.FIELDS,
+                fields: {
+                    table: {
+                        type: types_1.DatasourceFieldType.STRING,
+                        required: true,
+                    },
+                    view: {
+                        type: types_1.DatasourceFieldType.STRING,
+                        required: true,
+                    },
+                    numRecords: {
+                        type: types_1.DatasourceFieldType.NUMBER,
+                        default: 10,
+                    },
                 },
             },
-        },
-        delete: {
-            type: types_1.QueryType.JSON,
-        },
-    },
-};
-class AirtableIntegration {
-    constructor(config) {
-        this.config = config;
-        this.client = new Airtable(config).base(config.base);
-    }
-    create(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { table, json } = query;
-            try {
-                return yield this.client(table).create([
-                    {
-                        fields: json,
+            update: {
+                type: types_1.QueryType.FIELDS,
+                customisable: true,
+                fields: {
+                    id: {
+                        display: "Record ID",
+                        type: types_1.DatasourceFieldType.STRING,
+                        required: true,
                     },
-                ]);
-            }
-            catch (err) {
-                console.error("Error writing to airtable", err);
-                throw err;
-            }
-        });
-    }
-    read(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const records = yield this.client(query.table)
-                    .select({ maxRecords: query.numRecords || 10, view: query.view })
-                    .firstPage();
-                // @ts-ignore
-                return records.map(({ fields }) => fields);
-            }
-            catch (err) {
-                console.error("Error writing to airtable", err);
-                return [];
-            }
-        });
-    }
-    update(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { table, id, json } = query;
-            try {
-                return yield this.client(table).update([
-                    {
-                        id,
-                        fields: json,
+                    table: {
+                        type: types_1.DatasourceFieldType.STRING,
+                        required: true,
                     },
-                ]);
-            }
-            catch (err) {
-                console.error("Error writing to airtable", err);
-                throw err;
-            }
-        });
-    }
-    delete(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return yield this.client(query.table).destroy(query.ids);
-            }
-            catch (err) {
-                console.error("Error writing to airtable", err);
-                throw err;
-            }
-        });
+                },
+            },
+            delete: {
+                type: types_1.QueryType.JSON,
+            },
+        },
+    };
+    class AirtableIntegration {
+        constructor(config) {
+            this.config = config;
+            this.client = new Airtable(config).base(config.base);
+        }
+        create(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const { table, json } = query;
+                try {
+                    return yield this.client(table).create([
+                        {
+                            fields: json,
+                        },
+                    ]);
+                }
+                catch (err) {
+                    console.error("Error writing to airtable", err);
+                    throw err;
+                }
+            });
+        }
+        read(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const records = yield this.client(query.table)
+                        .select({ maxRecords: query.numRecords || 10, view: query.view })
+                        .firstPage();
+                    // @ts-ignore
+                    return records.map(({ fields }) => fields);
+                }
+                catch (err) {
+                    console.error("Error writing to airtable", err);
+                    return [];
+                }
+            });
+        }
+        update(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const { table, id, json } = query;
+                try {
+                    return yield this.client(table).update([
+                        {
+                            id,
+                            fields: json,
+                        },
+                    ]);
+                }
+                catch (err) {
+                    console.error("Error writing to airtable", err);
+                    throw err;
+                }
+            });
+        }
+        delete(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    return yield this.client(query.table).destroy(query.ids);
+                }
+                catch (err) {
+                    console.error("Error writing to airtable", err);
+                    throw err;
+                }
+            });
+        }
     }
-}
-exports.default = {
-    schema: SCHEMA,
-    integration: AirtableIntegration,
-};
+    module.exports = {
+        schema: SCHEMA,
+        integration: AirtableIntegration,
+    };
+})(AirtableModule || (AirtableModule = {}));