@budibase/server 2.2.4-alpha.7 → 2.2.4-alpha.8

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 = void 0;
+exports.updateAppPackage = exports.sync = exports.unpublish = 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");
@@ -416,39 +416,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;
-        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
+        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
             yield sdk_1.default.applications.syncApp(devAppId);
+            yield unpublishApp(ctx);
         }
-        const db = isUnpublish ? backend_core_1.context.getProdAppDB() : backend_core_1.context.getAppDB();
+        const db = backend_core_1.db.getDB(devAppId);
+        // standard app deletion flow
         const app = yield db.get(utils_1.DocumentType.APP_METADATA);
         const result = yield db.destroy();
-        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 pro_1.quotas.removeApp();
+        yield backend_core_1.events.app.deleted(app);
+        if (!environment_1.default.isTest()) {
             yield (0, fileSystem_1.deleteApp)(appId);
         }
-        // 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);
+        yield (0, workerRequests_1.removeAppFromUserRoles)(ctx, appId);
+        yield backend_core_1.cache.app.invalidateAppMetadata(devAppId);
         return result;
     });
 }
@@ -477,6 +477,19 @@ 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/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.deployApp = exports.deploymentProgress = exports.fetchDeployments = void 0;
+exports.publishApp = 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,8 +92,46 @@ function initDeployedApp(prodAppId) {
         });
     });
 }
-function deployApp(deployment, userId) {
+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) {
     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();
@@ -103,7 +141,7 @@ function deployApp(deployment, userId) {
             if (yield pro_1.backups.isEnabled()) {
                 // trigger backup initially
                 yield pro_1.backups.triggerAppBackup(productionAppId, types_1.AppBackupTrigger.PUBLISH, {
-                    createdBy: userId,
+                    createdBy: ctx.user._id,
                 });
             }
             const config = {
@@ -141,7 +179,7 @@ function deployApp(deployment, userId) {
             console.log("Deployed app initialised, setting deployment to successful");
             deployment.setStatus(DeploymentStatus.SUCCESS);
             yield storeDeploymentHistory(deployment);
-            return appDoc;
+            app = appDoc;
         }
         catch (err) {
             deployment.setStatus(DeploymentStatus.FAILURE, err.message);
@@ -153,63 +191,8 @@ function deployApp(deployment, userId) {
                 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.deployApp = _deployApp;
+exports.publishApp = publishApp;

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

@@ -32,10 +32,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.destroy = exports.update = exports.read = exports.create = exports.search = void 0;
+exports.publish = exports.unpublish = 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;
@@ -116,10 +117,30 @@ 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/routes/application.js

@@ -27,6 +27,7 @@ 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");
@@ -40,5 +41,7 @@ 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,6 +32,5 @@ 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)
-    .post("/api/deploy", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.deployApp);
+    .get("/api/deploy/:deploymentId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.deploymentProgress);
 module.exports = router;

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

@@ -85,6 +85,43 @@ write.push(new Endpoint_1.default("put", "/applications/:appId", applications_1.
  *                 $ref: '#/components/examples/application'
  */
 write.push(new Endpoint_1.default("delete", "/applications/:appId", applications_1.default.destroy));
+/**
+ * @openapi
+ * /applications/{appId}/unpublish:
+ *   post:
+ *     operationId: unpublish
+ *     summary: Unpublish an application
+ *     tags:
+ *       - applications
+ *     parameters:
+ *       - $ref: '#/components/parameters/appIdUrl'
+ *     responses:
+ *       204:
+ *         description: The app was published successfully.
+ */
+write.push(new Endpoint_1.default("post", "/applications/:appId/unpublish", applications_1.default.unpublish));
+/**
+ * @openapi
+ * /applications/{appId}/publish:
+ *   post:
+ *     operationId: publish
+ *     summary: Unpublish an application
+ *     tags:
+ *       - applications
+ *     parameters:
+ *       - $ref: '#/components/parameters/appIdUrl'
+ *     responses:
+ *       200:
+ *         description: Returns the deployment object.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/deploymentOutput'
+ *             examples:
+ *               deployment:
+ *                 $ref: '#/components/examples/deploymentOutput'
+ */
+write.push(new Endpoint_1.default("post", "/applications/:appId/publish", applications_1.default.publish));
 /**
  * @openapi
  * /applications/{appId}:

package/dist/api/routes/public/middleware/mapper.js

@@ -66,6 +66,9 @@ function processQueries(ctx) {
     }
 }
 exports.default = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!ctx.body) {
+        return yield next();
+    }
     let urlParts = ctx.url.split("/");
     urlParts = urlParts.slice(4, urlParts.length);
     let body = {};

package/dist/environment.js

@@ -96,7 +96,7 @@ const environment = {
     },
 };
 // threading can cause memory issues with node-ts in development
-if (isDev() && module.exports.DISABLE_THREADING == null) {
+if (isDev() && environment.DISABLE_THREADING == null) {
     environment._set("DISABLE_THREADING", "1");
 }
 // clean up any environment variable edge cases

package/dist/integrations/googlesheets.js

@@ -242,7 +242,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                return yield this.client.addSheet({ title: name });
+                return yield this.client.addSheet({ title: name, headerValues: ["test"] });
             }
             catch (err) {
                 console.error("Error creating new table in google sheets", err);

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.2.4-alpha.6",
+    "version": "2.2.4-alpha.7",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -43,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.2.4-alpha.6",
-        "@budibase/client": "2.2.4-alpha.6",
-        "@budibase/pro": "2.2.4-alpha.6",
-        "@budibase/string-templates": "2.2.4-alpha.6",
-        "@budibase/types": "2.2.4-alpha.6",
+        "@budibase/backend-core": "2.2.4-alpha.7",
+        "@budibase/client": "2.2.4-alpha.7",
+        "@budibase/pro": "2.2.4-alpha.7",
+        "@budibase/string-templates": "2.2.4-alpha.7",
+        "@budibase/types": "2.2.4-alpha.7",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",