@budibase/server 2.2.12-alpha.1 → 2.2.12

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.unpublish = exports.destroy = exports.revertClient = exports.updateClient = exports.update = exports.create = exports.fetchAppPackage = exports.fetchAppDefinition = exports.fetch = void 0;
+exports.updateAppPackage = exports.sync = exports.destroy = exports.revertClient = exports.updateClient = exports.update = exports.create = exports.fetchAppPackage = exports.fetchAppDefinition = exports.fetch = void 0;
 const environment_1 = __importDefault(require("../../environment"));
 const package_json_1 = __importDefault(require("../../../package.json"));
 const staticViews_1 = require("../../db/views/staticViews");
@@ -24,13 +24,14 @@ const datasource_bb_default_1 = require("../../db/defaultData/datasource_bb_defa
 const workerRequests_1 = require("../../utilities/workerRequests");
 const utilities_1 = require("../../utilities");
 const redis_1 = require("../../utilities/redis");
-const fileSystem_2 = require("../../utilities/fileSystem");
+const clientLibrary_1 = require("../../utilities/fileSystem/clientLibrary");
 const utils_2 = require("../../automations/utils");
 const logging_1 = require("../../automations/logging");
 const rows_1 = require("../../utilities/usageQuota/rows");
 const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 const layouts_1 = require("../../constants/layouts");
+const plugins_1 = require("../../utilities/plugins");
 const sdk_1 = __importDefault(require("../../sdk"));
 // utility function, need to do away with this
 function getLayouts() {
@@ -163,25 +164,25 @@ function fetchAppDefinition(ctx) {
 }
 exports.fetchAppDefinition = fetchAppDefinition;
 function fetchAppPackage(ctx) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
         let application = yield db.get(utils_1.DocumentType.APP_METADATA);
         const layouts = yield getLayouts();
         let screens = yield getScreens();
         // Enrich plugin URLs
-        application.usedPlugins = backend_core_1.objectStore.enrichPluginURLs(application.usedPlugins);
+        application.usedPlugins = (0, plugins_1.enrichPluginURLs)(application.usedPlugins);
         // Only filter screens if the user is not a builder
-        if (!(ctx.user.builder && ctx.user.builder.global)) {
+        if (!(((_a = ctx.user) === null || _a === void 0 ? void 0 : _a.builder) && ctx.user.builder.global)) {
             const userRoleId = getUserRoleId(ctx);
             const accessController = new backend_core_1.roles.AccessController();
             screens = yield accessController.checkScreensAccess(screens, userRoleId);
         }
-        const clientLibPath = backend_core_1.objectStore.clientLibraryUrl(ctx.params.appId, application.version);
         ctx.body = {
             application,
             screens,
             layouts,
-            clientLibPath,
+            clientLibPath: (0, utilities_1.clientLibraryPath)(ctx.params.appId, application.version),
         };
     });
 }
@@ -324,7 +325,7 @@ function appPostCreate(ctx, app) {
                     if (err.code && err.code === backend_core_1.errors.codes.USAGE_LIMIT_EXCEEDED) {
                         // this import resulted in row usage exceeding the quota
                         // delete the app
-                        // skip pre and post-steps as no rows have been added to quotas yet
+                        // skip pre- and post-steps as no rows have been added to quotas yet
                         ctx.params.appId = app.appId;
                         yield destroyApp(ctx);
                     }
@@ -374,8 +375,8 @@ function updateClient(ctx) {
         const currentVersion = application.version;
         // Update client library and manifest
         if (!environment_1.default.isTest()) {
-            yield (0, fileSystem_2.backupClientLibrary)(ctx.params.appId);
-            yield (0, fileSystem_2.updateClientLibrary)(ctx.params.appId);
+            yield (0, clientLibrary_1.backupClientLibrary)(ctx.params.appId);
+            yield (0, clientLibrary_1.updateClientLibrary)(ctx.params.appId);
         }
         // Update versions in app package
         const updatedToVersion = package_json_1.default.version;
@@ -400,7 +401,7 @@ function revertClient(ctx) {
         }
         // Update client library and manifest
         if (!environment_1.default.isTest()) {
-            yield (0, fileSystem_2.revertClientLibrary)(ctx.params.appId);
+            yield (0, clientLibrary_1.revertClientLibrary)(ctx.params.appId);
         }
         // Update versions in app package
         const currentVersion = application.version;
@@ -416,39 +417,39 @@ function revertClient(ctx) {
     });
 }
 exports.revertClient = revertClient;
-const unpublishApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    let appId = ctx.params.appId;
-    appId = backend_core_1.db.getProdAppID(appId);
-    const db = backend_core_1.context.getProdAppDB();
-    const result = yield db.destroy();
-    yield backend_core_1.events.app.unpublished({ appId });
-    // automations only in production
-    yield (0, utils_2.cleanupAutomations)(appId);
-    yield backend_core_1.cache.app.invalidateAppMetadata(appId);
-    return result;
-});
 function destroyApp(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         let appId = ctx.params.appId;
-        appId = backend_core_1.db.getProdAppID(appId);
-        const devAppId = backend_core_1.db.getDevAppID(appId);
-        // check if we need to unpublish first
-        if (yield backend_core_1.db.dbExists(appId)) {
-            // app is deployed, run through unpublish flow
+        let isUnpublish = ctx.query && ctx.query.unpublish;
+        if (isUnpublish) {
+            appId = backend_core_1.db.getProdAppID(appId);
+            const devAppId = backend_core_1.db.getDevAppID(appId);
+            // sync before removing the published app
             yield sdk_1.default.applications.syncApp(devAppId);
-            yield unpublishApp(ctx);
         }
-        const db = backend_core_1.db.getDB(devAppId);
-        // standard app deletion flow
+        const db = isUnpublish ? backend_core_1.context.getProdAppDB() : backend_core_1.context.getAppDB();
         const app = yield db.get(utils_1.DocumentType.APP_METADATA);
         const result = yield db.destroy();
-        yield pro_1.quotas.removeApp();
-        yield backend_core_1.events.app.deleted(app);
-        if (!environment_1.default.isTest()) {
+        if (isUnpublish) {
+            yield backend_core_1.events.app.unpublished(app);
+        }
+        else {
+            yield pro_1.quotas.removeApp();
+            yield backend_core_1.events.app.deleted(app);
+        }
+        /* istanbul ignore next */
+        if (!environment_1.default.isTest() && !isUnpublish) {
             yield (0, fileSystem_1.deleteApp)(appId);
         }
-        yield (0, workerRequests_1.removeAppFromUserRoles)(ctx, appId);
-        yield backend_core_1.cache.app.invalidateAppMetadata(devAppId);
+        // automations only in production
+        if (isUnpublish) {
+            yield (0, utils_2.cleanupAutomations)(appId);
+        }
+        // remove app role when the dev app is deleted (no trace of app anymore)
+        else {
+            yield (0, workerRequests_1.removeAppFromUserRoles)(ctx, appId);
+        }
+        yield backend_core_1.cache.app.invalidateAppMetadata(appId);
         return result;
     });
 }
@@ -477,19 +478,6 @@ function destroy(ctx) {
     });
 }
 exports.destroy = destroy;
-const unpublish = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const prodAppId = backend_core_1.db.getProdAppID(ctx.params.appId);
-    const dbExists = yield backend_core_1.db.dbExists(prodAppId);
-    // check app has been published
-    if (!dbExists) {
-        return ctx.throw(400, "App has not been published.");
-    }
-    yield preDestroyApp(ctx);
-    yield unpublishApp(ctx);
-    yield postDestroyApp(ctx);
-    ctx.status = 204;
-});
-exports.unpublish = unpublish;
 function sync(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.params.appId;

package/dist/api/controllers/cloud.js

@@ -95,15 +95,11 @@ function importApps(ctx) {
         if (beenImported || !ctx.request.files || !ctx.request.files.importFile) {
             ctx.throw(400, "Import file is required and environment must be fresh to import apps.");
         }
-        const file = ctx.request.files.importFile;
-        if (Array.isArray(file)) {
-            ctx.throw(400, "Single file is required");
-        }
-        if (file.type !== "application/gzip") {
+        if (ctx.request.files.importFile.type !== "application/gzip") {
             ctx.throw(400, "Import file must be a gzipped tarball.");
         }
         // initially get all the app databases out of the tarball
-        const tmpPath = sdk_1.default.backups.untarFile(file);
+        const tmpPath = sdk_1.default.backups.untarFile(ctx.request.files.importFile);
         const globalDbImport = sdk_1.default.backups.getGlobalDBFile(tmpPath);
         const appNames = sdk_1.default.backups.getListOfAppsInMulti(tmpPath);
         const globalDb = backend_core_1.tenancy.getGlobalDB();

package/dist/api/controllers/deploy/index.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.publishApp = exports.deploymentProgress = exports.fetchDeployments = void 0;
+exports.deployApp = exports.deploymentProgress = exports.fetchDeployments = void 0;
 const Deployment_1 = __importDefault(require("./Deployment"));
 const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../../../db/utils");
@@ -92,46 +92,8 @@ function initDeployedApp(prodAppId) {
         });
     });
 }
-function fetchDeployments(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const db = backend_core_1.context.getAppDB();
-            const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
-            const { updated, deployments } = yield checkAllDeployments(deploymentDoc);
-            if (updated) {
-                yield db.put(deployments);
-            }
-            ctx.body = Object.values(deployments.history).reverse();
-        }
-        catch (err) {
-            ctx.body = [];
-        }
-    });
-}
-exports.fetchDeployments = fetchDeployments;
-function deploymentProgress(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const db = backend_core_1.context.getAppDB();
-            const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
-            ctx.body = deploymentDoc[ctx.params.deploymentId];
-        }
-        catch (err) {
-            ctx.throw(500, `Error fetching data for deployment ${ctx.params.deploymentId}`);
-        }
-    });
-}
-exports.deploymentProgress = deploymentProgress;
-const publishApp = function (ctx) {
+function deployApp(deployment, userId) {
     return __awaiter(this, void 0, void 0, function* () {
-        let deployment = new Deployment_1.default();
-        console.log("Deployment object created");
-        deployment.setStatus(DeploymentStatus.PENDING);
-        console.log("Deployment object set to pending");
-        deployment = yield storeDeploymentHistory(deployment);
-        console.log("Stored deployment history");
-        console.log("Deploying app...");
-        let app;
         let replication;
         try {
             const appId = backend_core_1.context.getAppId();
@@ -141,7 +103,7 @@ const publishApp = function (ctx) {
             if (yield pro_1.backups.isEnabled()) {
                 // trigger backup initially
                 yield pro_1.backups.triggerAppBackup(productionAppId, types_1.AppBackupTrigger.PUBLISH, {
-                    createdBy: ctx.user._id,
+                    createdBy: userId,
                 });
             }
             const config = {
@@ -179,7 +141,7 @@ const publishApp = function (ctx) {
             console.log("Deployed app initialised, setting deployment to successful");
             deployment.setStatus(DeploymentStatus.SUCCESS);
             yield storeDeploymentHistory(deployment);
-            app = appDoc;
+            return appDoc;
         }
         catch (err) {
             deployment.setStatus(DeploymentStatus.FAILURE, err.message);
@@ -191,8 +153,63 @@ const publishApp = function (ctx) {
                 yield replication.close();
             }
         }
+    });
+}
+function fetchDeployments(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const db = backend_core_1.context.getAppDB();
+            const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
+            const { updated, deployments } = yield checkAllDeployments(deploymentDoc);
+            if (updated) {
+                yield db.put(deployments);
+            }
+            ctx.body = Object.values(deployments.history).reverse();
+        }
+        catch (err) {
+            ctx.body = [];
+        }
+    });
+}
+exports.fetchDeployments = fetchDeployments;
+function deploymentProgress(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const db = backend_core_1.context.getAppDB();
+            const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
+            ctx.body = deploymentDoc[ctx.params.deploymentId];
+        }
+        catch (err) {
+            ctx.throw(500, `Error fetching data for deployment ${ctx.params.deploymentId}`);
+        }
+    });
+}
+exports.deploymentProgress = deploymentProgress;
+const isFirstDeploy = () => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const db = backend_core_1.context.getProdAppDB();
+        yield db.get(utils_1.DocumentType.APP_METADATA);
+    }
+    catch (e) {
+        if (e.status === 404) {
+            return true;
+        }
+        throw e;
+    }
+    return false;
+});
+const _deployApp = function (ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let deployment = new Deployment_1.default();
+        console.log("Deployment object created");
+        deployment.setStatus(DeploymentStatus.PENDING);
+        console.log("Deployment object set to pending");
+        deployment = yield storeDeploymentHistory(deployment);
+        console.log("Stored deployment history");
+        console.log("Deploying app...");
+        let app = yield deployApp(deployment, ctx.user._id);
         yield backend_core_1.events.app.published(app);
         ctx.body = deployment;
     });
 };
-exports.publishApp = publishApp;
+exports.deployApp = _deployApp;

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

@@ -18,15 +18,15 @@ const backend_core_1 = require("@budibase/backend-core");
 const types_1 = require("@budibase/types");
 const environment_1 = __importDefault(require("../../../environment"));
 const websocket_1 = require("../../../websocket");
+const backend_core_2 = require("@budibase/backend-core");
 const pro_1 = require("@budibase/pro");
 function getPlugins(type) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.tenancy.getGlobalDB();
-        const response = yield db.allDocs(backend_core_1.db.getPluginParams(null, {
+        const response = yield db.allDocs(backend_core_2.db.getPluginParams(null, {
             include_docs: true,
         }));
-        let plugins = response.rows.map((row) => row.doc);
-        plugins = backend_core_1.objectStore.enrichPluginURLs(plugins);
+        const plugins = response.rows.map((row) => row.doc);
         if (type) {
             return plugins.filter((plugin) => { var _a; return ((_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.type) === type; });
         }
@@ -92,7 +92,7 @@ function create(ctx) {
             if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
                 throw new Error("Only component plugins are supported outside of self-host");
             }
-            const doc = yield pro_1.sdk.plugins.storePlugin(metadata, directory, source);
+            const doc = yield pro_1.plugins.storePlugin(metadata, directory, source);
             websocket_1.ClientAppSocket.emit("plugins-update", { name, hash: doc.hash });
             ctx.body = {
                 message: "Plugin uploaded successfully",
@@ -117,7 +117,7 @@ function destroy(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const { pluginId } = ctx.params;
         try {
-            yield pro_1.sdk.plugins.deletePlugin(pluginId);
+            yield pro_1.plugins.deletePlugin(pluginId);
             ctx.body = { message: `Plugin ${ctx.params.pluginId} deleted.` };
         }
         catch (err) {
@@ -135,7 +135,7 @@ function processUploadedPlugin(plugin, source) {
         if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
             throw new Error("Only component plugins are supported outside of self-host");
         }
-        const doc = yield pro_1.sdk.plugins.storePlugin(metadata, directory, source);
+        const doc = yield pro_1.plugins.storePlugin(metadata, directory, source);
         websocket_1.ClientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash });
         return doc;
     });

package/dist/api/controllers/public/applications.js

@@ -32,11 +32,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.publish = exports.unpublish = exports.destroy = exports.update = exports.read = exports.create = exports.search = void 0;
+exports.destroy = exports.update = exports.read = exports.create = exports.search = void 0;
 const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("./utils");
 const controller = __importStar(require("../application"));
-const deployController = __importStar(require("../deploy"));
 function fixAppID(app, params) {
     if (!params) {
         return app;
@@ -117,30 +116,10 @@ function destroy(ctx, next) {
     });
 }
 exports.destroy = destroy;
-function unpublish(ctx, next) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield backend_core_1.context.doInAppContext(ctx.params.appId, () => __awaiter(this, void 0, void 0, function* () {
-            yield controller.unpublish(ctx);
-            yield next();
-        }));
-    });
-}
-exports.unpublish = unpublish;
-function publish(ctx, next) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield backend_core_1.context.doInAppContext(ctx.params.appId, () => __awaiter(this, void 0, void 0, function* () {
-            yield deployController.publishApp(ctx);
-            yield next();
-        }));
-    });
-}
-exports.publish = publish;
 exports.default = {
     create,
     update,
     read,
     destroy,
     search,
-    publish,
-    unpublish,
 };

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

@@ -27,6 +27,7 @@ const utils_2 = require("./utils");
 const constants_1 = require("../../../constants");
 const utils_3 = require("../../../integrations/utils");
 const string_templates_1 = require("@budibase/string-templates");
+// @ts-ignore
 const fp_1 = require("lodash/fp");
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const backend_core_1 = require("@budibase/backend-core");

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

@@ -52,12 +52,12 @@ const utils_1 = require("../../../db/utils");
 const userController = __importStar(require("../user"));
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const constants_1 = require("../../../constants");
-const utils = __importStar(require("./utils"));
+const utils_2 = require("./utils");
 const internalSearch_1 = require("./internalSearch");
 const global_1 = require("../../../utilities/global");
 const inMemoryViews = __importStar(require("../../../db/inMemoryView"));
 const environment_1 = __importDefault(require("../../../environment"));
-const utils_2 = require("../view/utils");
+const utils_3 = require("../view/utils");
 const fp_1 = require("lodash/fp");
 const backend_core_1 = require("@budibase/backend-core");
 const staticFormula_1 = require("./staticFormula");
@@ -70,9 +70,9 @@ const CALCULATION_TYPES = {
 };
 function getView(db, viewName) {
     return __awaiter(this, void 0, void 0, function* () {
-        let mainGetter = environment_1.default.SELF_HOSTED ? utils_2.getFromDesignDoc : utils_2.getFromMemoryDoc;
-        let secondaryGetter = environment_1.default.SELF_HOSTED ? utils_2.getFromMemoryDoc : utils_2.getFromDesignDoc;
-        let migration = environment_1.default.SELF_HOSTED ? utils_2.migrateToDesignView : utils_2.migrateToInMemoryView;
+        let mainGetter = environment_1.default.SELF_HOSTED ? utils_3.getFromDesignDoc : utils_3.getFromMemoryDoc;
+        let secondaryGetter = environment_1.default.SELF_HOSTED ? utils_3.getFromMemoryDoc : utils_3.getFromDesignDoc;
+        let migration = environment_1.default.SELF_HOSTED ? utils_3.migrateToDesignView : utils_3.migrateToInMemoryView;
         let viewInfo, migrate = false;
         try {
             viewInfo = yield mainGetter(db, viewName);
@@ -121,7 +121,7 @@ function patch(ctx) {
         let oldRow;
         try {
             let dbTable = yield db.get(tableId);
-            oldRow = yield (0, rowProcessor_1.outputProcessing)(dbTable, yield utils.findRow(ctx, tableId, inputs._id));
+            oldRow = yield (0, rowProcessor_1.outputProcessing)(dbTable, yield (0, utils_2.findRow)(ctx, tableId, inputs._id));
         }
         catch (err) {
             if (isUserTable) {
@@ -145,7 +145,7 @@ function patch(ctx) {
         }
         // this returns the table and row incase they have been updated
         let { table, row } = (0, rowProcessor_1.inputProcessing)(ctx.user, dbTable, combinedRow);
-        const validateResult = yield utils.validate({
+        const validateResult = yield (0, utils_2.validate)({
             row,
             table,
         });
@@ -185,7 +185,7 @@ function save(ctx) {
         // this returns the table and row incase they have been updated
         const dbTable = yield db.get(inputs.tableId);
         let { table, row } = (0, rowProcessor_1.inputProcessing)(ctx.user, dbTable, inputs);
-        const validateResult = yield utils.validate({
+        const validateResult = yield (0, utils_2.validate)({
             row,
             table,
         });
@@ -208,7 +208,7 @@ function save(ctx) {
 exports.save = save;
 function fetchView(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const viewName = decodeURIComponent(ctx.params.viewName);
+        const viewName = ctx.params.viewName;
         // if this is a table view being looked for just transfer to that
         if (viewName.startsWith(utils_1.DocumentType.TABLE)) {
             ctx.params.tableId = viewName;
@@ -274,7 +274,7 @@ function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.db.getDB(ctx.appId);
         const table = yield db.get(ctx.params.tableId);
-        let row = yield utils.findRow(ctx, ctx.params.tableId, ctx.params.rowId);
+        let row = yield (0, utils_2.findRow)(ctx, ctx.params.tableId, ctx.params.rowId);
         row = yield (0, rowProcessor_1.outputProcessing)(table, row);
         return row;
     });
@@ -386,7 +386,7 @@ function search(ctx) {
 exports.search = search;
 function validate(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        return utils.validate({
+        return (0, utils_2.validate)({
             tableId: ctx.params.tableId,
             row: ctx.request.body,
         });
@@ -436,7 +436,7 @@ function fetchEnrichedRow(ctx) {
         // need table to work out where links go in row
         let [table, row] = yield Promise.all([
             db.get(tableId),
-            utils.findRow(ctx, tableId, rowId),
+            (0, utils_2.findRow)(ctx, tableId, rowId),
         ]);
         // get the link docs
         const linkVals = (yield linkRows.getLinkDocuments({

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

@@ -153,7 +153,7 @@ function finaliseRow(table, row, { oldTable, updateFormula } = {
         enrichedRow = yield (0, rowProcessor_1.processFormulas)(table, enrichedRow, { dynamic: false });
         // this updates the related formulas in other rows based on the relations to this row
         if (updateFormula) {
-            yield updateRelatedFormula(table, enrichedRow);
+            yield exports.updateRelatedFormula(table, enrichedRow);
         }
         return { row: enrichedRow, table };
     });

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

@@ -10,14 +10,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSignedUploadURL = exports.serveClientLibrary = exports.serveBuilderPreview = exports.serveApp = exports.deleteObjects = exports.uploadFile = exports.serveBuilder = exports.toggleBetaUiFeature = void 0;
+const plugins_1 = require("../../../utilities/plugins");
 require("svelte/register");
 const send = require("koa-send");
 const { resolve, join } = require("../../../utilities/centralPath");
 const uuid = require("uuid");
-const constants_1 = require("../../../constants");
+const { ObjectStoreBuckets } = require("../../../constants");
 const { processString } = require("@budibase/string-templates");
 const { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, } = require("../../../utilities/fileSystem");
 const env = require("../../../environment");
+const { clientLibraryPath } = require("../../../utilities");
+const { attachmentsRelativeURL } = require("../../../utilities");
 const { DocumentType } = require("../../../db/utils");
 const { context, objectStore, utils } = require("@budibase/backend-core");
 const AWS = require("aws-sdk");
@@ -35,7 +38,7 @@ function prepareUpload({ s3Key, bucket, metadata, file }) {
         return {
             size: file.size,
             name: file.name,
-            url: objectStore.getAppFileUrl(s3Key),
+            url: attachmentsRelativeURL(response.Key),
             extension: [...file.name.split(".")].pop(),
             key: response.Key,
         };
@@ -82,8 +85,8 @@ const uploadFile = function (ctx) {
             const processedFileName = `${uuid.v4()}.${fileExtension}`;
             return prepareUpload({
                 file,
-                s3Key: `${context.getProdAppId()}/attachments/${processedFileName}`,
-                bucket: constants_1.ObjectStoreBuckets.APPS,
+                s3Key: `${ctx.appId}/attachments/${processedFileName}`,
+                bucket: ObjectStoreBuckets.APPS,
             });
         }));
         ctx.body = yield Promise.all(uploads);
@@ -92,7 +95,7 @@ const uploadFile = function (ctx) {
 exports.uploadFile = uploadFile;
 const deleteObjects = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = yield objectStore.deleteFiles(constants_1.ObjectStoreBuckets.APPS, ctx.request.body.keys);
+        ctx.body = yield objectStore.deleteFiles(ObjectStoreBuckets.APPS, ctx.request.body.keys);
     });
 };
 exports.deleteObjects = deleteObjects;
@@ -103,13 +106,13 @@ const serveApp = function (ctx) {
         let appId = context.getAppId();
         if (!env.isJest()) {
             const App = require("./templates/BudibaseApp.svelte").default;
-            const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins);
+            const plugins = (0, plugins_1.enrichPluginURLs)(appInfo.usedPlugins);
             const { head, html, css } = App.render({
                 metaImage: "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
                 title: appInfo.name,
                 production: env.isProd(),
                 appId,
-                clientLibPath: objectStore.clientLibraryUrl(appId, appInfo.version),
+                clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
                 usedPlugins: plugins,
             });
             const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`);
@@ -135,7 +138,7 @@ const serveBuilderPreview = function (ctx) {
             let appId = context.getAppId();
             const previewHbs = loadHandlebarsFile(`${__dirname}/templates/preview.hbs`);
             ctx.body = yield processString(previewHbs, {
-                clientLibPath: objectStore.clientLibraryUrl(appId, appInfo.version),
+                clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
             });
         }
         else {

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

@@ -145,7 +145,7 @@ function handleViewEvents(existingView, newView) {
 function destroy(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
-        const viewName = decodeURIComponent(ctx.params.viewName);
+        const viewName = decodeURI(ctx.params.viewName);
         const view = yield (0, utils_1.deleteView)(viewName);
         const table = yield db.get(view.meta.tableId);
         delete table.views[viewName];
@@ -157,7 +157,7 @@ function destroy(ctx) {
 exports.destroy = destroy;
 function exportView(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const viewName = decodeURIComponent(ctx.query.view);
+        const viewName = decodeURI(ctx.query.view);
         const view = yield (0, utils_1.getView)(viewName);
         const format = ctx.query.format;
         if (!format || !Object.values(exporters.ExportFormats).includes(format)) {

package/dist/api/routes/application.js

@@ -27,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const router_1 = __importDefault(require("@koa/router"));
 const controller = __importStar(require("../controllers/application"));
-const deploymentController = __importStar(require("../controllers/deploy"));
 const authorized_1 = __importDefault(require("../../middleware/authorized"));
 const backend_core_1 = require("@budibase/backend-core");
 const validators_1 = require("./utils/validators");
@@ -41,7 +40,5 @@ router
     .put("/api/applications/:appId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), (0, validators_1.applicationValidator)({ isCreate: false }), controller.update)
     .post("/api/applications/:appId/client/update", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.updateClient)
     .post("/api/applications/:appId/client/revert", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.revertClient)
-    .post("/api/applications/:appId/publish", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), deploymentController.publishApp)
-    .post("/api/applications/:appId/unpublish", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.unpublish)
     .delete("/api/applications/:appId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.destroy);
 module.exports = router;

package/dist/api/routes/deploy.js

@@ -32,5 +32,6 @@ const backend_core_1 = require("@budibase/backend-core");
 const router = new router_1.default();
 router
     .get("/api/deployments", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.fetchDeployments)
-    .get("/api/deploy/:deploymentId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.deploymentProgress);
+    .get("/api/deploy/:deploymentId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.deploymentProgress)
+    .post("/api/deploy", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.deployApp);
 module.exports = router;