@budibase/server 0.9.165 → 0.9.167-alpha.2

package/coverage/lcov.info

@@ -872,21 +872,27 @@ end_of_record
 TN:
 SF:src/api/controllers/dev.js
 FN:10,redirect
-FN:44,(anonymous_1)
-FN:48,(anonymous_2)
+FN:46,(anonymous_1)
+FN:47,(anonymous_2)
 FN:52,(anonymous_3)
-FN:56,(anonymous_4)
-FN:68,(anonymous_5)
-FN:102,(anonymous_6)
-FNF:7
-FNH:0
+FN:53,(anonymous_4)
+FN:58,(anonymous_5)
+FN:59,(anonymous_6)
+FN:64,(anonymous_7)
+FN:76,(anonymous_8)
+FN:110,(anonymous_9)
+FNF:10
+FNH:3
 FNDA:0,redirect
-FNDA:0,(anonymous_1)
+FNDA:46,(anonymous_1)
 FNDA:0,(anonymous_2)
-FNDA:0,(anonymous_3)
+FNDA:46,(anonymous_3)
 FNDA:0,(anonymous_4)
-FNDA:0,(anonymous_5)
+FNDA:46,(anonymous_5)
 FNDA:0,(anonymous_6)
+FNDA:0,(anonymous_7)
+FNDA:0,(anonymous_8)
+FNDA:0,(anonymous_9)
 DA:1,23
 DA:2,23
 DA:3,23
@@ -898,62 +904,66 @@ DA:8,23
 DA:11,0
 DA:12,0
 DA:13,0
-DA:24,0
-DA:25,0
+DA:26,0
 DA:27,0
-DA:28,0
 DA:29,0
-DA:32,0
-DA:33,0
-DA:37,0
-DA:38,0
+DA:30,0
+DA:31,0
+DA:34,0
+DA:35,0
 DA:39,0
+DA:40,0
 DA:41,0
-DA:44,23
-DA:45,0
-DA:48,23
-DA:49,0
+DA:43,0
+DA:46,23
+DA:47,46
+DA:48,0
 DA:52,23
-DA:53,0
-DA:56,23
-DA:57,0
-DA:58,0
-DA:59,0
-DA:61,0
-DA:63,0
-DA:68,23
+DA:53,46
+DA:54,0
+DA:58,23
+DA:59,46
+DA:60,0
+DA:64,23
+DA:65,0
+DA:66,0
+DA:67,0
 DA:69,0
-DA:70,0
-DA:73,0
-DA:74,0
-DA:75,0
-DA:76,0
+DA:71,0
+DA:76,23
+DA:77,0
 DA:78,0
 DA:81,0
 DA:82,0
-DA:87,0
+DA:83,0
+DA:84,0
+DA:86,0
 DA:89,0
 DA:90,0
-DA:91,0
-DA:92,0
-DA:93,0
-DA:94,0
+DA:95,0
+DA:97,0
 DA:98,0
-DA:102,23
-DA:103,0
-LF:54
-LH:14
-BRDA:12,0,0,0
-BRDA:12,0,1,0
-BRDA:24,1,0,0
-BRDA:24,1,1,0
-BRDA:28,2,0,0
-BRDA:28,2,1,0
-BRDA:38,3,0,0
-BRDA:38,3,1,0
-BRDA:76,4,0,0
-BRDA:76,4,1,0
-BRF:10
+DA:99,0
+DA:100,0
+DA:101,0
+DA:102,0
+DA:106,0
+DA:110,23
+DA:111,0
+LF:57
+LH:17
+BRDA:10,0,0,0
+BRDA:12,1,0,0
+BRDA:12,1,1,0
+BRDA:26,2,0,0
+BRDA:26,2,1,0
+BRDA:30,3,0,0
+BRDA:30,3,1,0
+BRDA:40,4,0,0
+BRDA:40,4,1,0
+BRDA:84,5,0,0
+BRDA:84,5,1,0
+BRF:11
 BRH:0
 end_of_record
 TN:
@@ -1668,14 +1678,27 @@ DA:2,23
 DA:6,23
 DA:8,23
 DA:9,1
-DA:10,1
+DA:11,1
+DA:12,1
 DA:13,1
 DA:14,1
-LF:8
-LH:8
+DA:15,0
+DA:18,0
+DA:21,1
+DA:22,1
+DA:23,1
+DA:25,0
+LF:15
+LH:12
 BRDA:9,0,0,1
-BRF:1
-BRH:1
+BRDA:14,1,0,0
+BRDA:14,1,1,1
+BRDA:21,2,0,1
+BRDA:21,2,1,0
+BRDA:21,3,0,1
+BRDA:21,3,1,1
+BRF:7
+BRH:5
 end_of_record
 TN:
 SF:src/api/controllers/user.js
@@ -3714,24 +3737,28 @@ BRH:0
 end_of_record
 TN:
 SF:src/api/routes/dev.js
-FNF:0
-FNH:0
+FN:9,redirectPath
+FNF:1
+FNH:1
+FNDA:46,redirectPath
 DA:1,23
 DA:2,23
 DA:3,23
 DA:4,23
 DA:5,23
 DA:7,23
-DA:9,23
-DA:10,23
+DA:10,46
 DA:16,23
+DA:17,23
+DA:18,23
 DA:21,23
-LF:10
-LH:10
-BRDA:9,0,0,23
-BRDA:9,0,1,0
-BRDA:9,1,0,23
-BRDA:9,1,1,0
+DA:26,23
+LF:12
+LH:12
+BRDA:16,0,0,23
+BRDA:16,0,1,0
+BRDA:16,1,0,23
+BRDA:16,1,1,0
 BRF:4
 BRH:2
 end_of_record
@@ -7338,9 +7365,9 @@ FN:62,(anonymous_3)
 FN:82,(anonymous_4)
 FN:96,processAutoColumn
 FN:152,(anonymous_6)
-FN:172,(anonymous_7)
-FN:213,(anonymous_8)
-FN:238,(anonymous_9)
+FN:176,(anonymous_7)
+FN:217,(anonymous_8)
+FN:242,(anonymous_9)
 FNF:10
 FNH:9
 FNDA:11,(anonymous_0)
@@ -7396,44 +7423,46 @@ DA:142,73
 DA:144,34
 DA:152,34
 DA:154,174
-DA:155,16
-DA:156,158
-DA:157,22
-DA:160,136
-DA:172,34
-DA:178,73
-DA:180,73
-DA:181,73
+DA:155,0
+DA:158,174
+DA:159,16
+DA:160,158
+DA:161,22
+DA:164,136
+DA:176,34
 DA:182,73
-DA:183,332
-DA:185,332
-DA:186,159
-DA:187,3
-DA:189,159
-DA:193,173
-DA:194,0
-DA:196,173
-DA:200,73
-DA:213,34
-DA:219,100
-DA:220,100
-DA:221,100
-DA:222,87
-DA:223,87
-DA:226,100
-DA:229,100
-DA:232,100
-DA:233,296
-DA:234,8
-DA:235,8
-DA:236,6
-DA:238,2
-DA:239,2
-DA:244,100
-DA:245,26
-DA:251,100
-LF:79
-LH:60
+DA:184,73
+DA:185,73
+DA:186,73
+DA:187,332
+DA:189,332
+DA:190,159
+DA:191,3
+DA:193,159
+DA:197,173
+DA:198,0
+DA:200,173
+DA:204,73
+DA:217,34
+DA:223,100
+DA:224,100
+DA:225,100
+DA:226,87
+DA:227,87
+DA:230,100
+DA:233,100
+DA:236,100
+DA:237,296
+DA:238,8
+DA:239,8
+DA:240,6
+DA:242,2
+DA:243,2
+DA:248,100
+DA:249,26
+DA:255,100
+LF:81
+LH:61
 BRDA:18,0,0,2
 BRDA:18,0,1,9
 BRDA:18,1,0,11
@@ -7473,33 +7502,35 @@ BRDA:135,15,0,0
 BRDA:135,15,1,0
 BRDA:136,16,0,0
 BRDA:136,16,1,0
-BRDA:154,17,0,16
-BRDA:154,17,1,158
-BRDA:156,18,0,22
-BRDA:156,18,1,136
-BRDA:173,19,0,0
-BRDA:176,20,0,72
-BRDA:185,21,0,159
-BRDA:185,21,1,173
-BRDA:186,22,0,3
-BRDA:186,22,1,156
-BRDA:193,23,0,0
-BRDA:193,23,1,173
-BRDA:217,24,0,26
-BRDA:221,25,0,87
-BRDA:221,25,1,13
-BRDA:233,26,0,8
-BRDA:233,26,1,288
-BRDA:235,27,0,6
-BRDA:235,27,1,2
-BRDA:235,28,0,8
-BRDA:235,28,1,6
-BRDA:244,29,0,26
-BRDA:244,29,1,74
-BRDA:251,30,0,13
-BRDA:251,30,1,87
-BRF:64
-BRH:36
+BRDA:154,17,0,0
+BRDA:154,17,1,174
+BRDA:158,18,0,16
+BRDA:158,18,1,158
+BRDA:160,19,0,22
+BRDA:160,19,1,136
+BRDA:177,20,0,0
+BRDA:180,21,0,72
+BRDA:189,22,0,159
+BRDA:189,22,1,173
+BRDA:190,23,0,3
+BRDA:190,23,1,156
+BRDA:197,24,0,0
+BRDA:197,24,1,173
+BRDA:221,25,0,26
+BRDA:225,26,0,87
+BRDA:225,26,1,13
+BRDA:237,27,0,8
+BRDA:237,27,1,288
+BRDA:239,28,0,6
+BRDA:239,28,1,2
+BRDA:239,29,0,8
+BRDA:239,29,1,6
+BRDA:248,30,0,26
+BRDA:248,30,1,74
+BRDA:255,31,0,13
+BRDA:255,31,1,87
+BRF:66
+BRH:37
 end_of_record
 TN:
 SF:src/utilities/rowProcessor/utils.js

package/dist/api/controllers/dev.js

@@ -16,11 +16,11 @@ const { request } = require("../../utilities/workerRequests");
 const { clearLock } = require("../../utilities/redis");
 const { Replication } = require("@budibase/auth").db;
 const { DocumentTypes } = require("../../db/utils");
-function redirect(ctx, method) {
+function redirect(ctx, method, path = "global") {
     return __awaiter(this, void 0, void 0, function* () {
         const { devPath } = ctx.params;
         const queryString = ctx.originalUrl.split("?")[1] || "";
-        const response = yield fetch(checkSlashesInUrl(`${env.WORKER_URL}/api/global/${devPath}?${queryString}`), request(ctx, {
+        const response = yield fetch(checkSlashesInUrl(`${env.WORKER_URL}/api/${path}/${devPath}?${queryString}`), request(ctx, {
             method,
             body: ctx.request.body,
         }, true));
@@ -45,15 +45,21 @@ function redirect(ctx, method) {
         ctx.cookies;
     });
 }
-exports.redirectGet = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    yield redirect(ctx, "GET");
-});
-exports.redirectPost = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    yield redirect(ctx, "POST");
-});
-exports.redirectDelete = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    yield redirect(ctx, "DELETE");
-});
+exports.buildRedirectGet = path => {
+    return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+        yield redirect(ctx, "GET", path);
+    });
+};
+exports.buildRedirectPost = path => {
+    return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+        yield redirect(ctx, "POST", path);
+    });
+};
+exports.buildRedirectDelete = path => {
+    return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+        yield redirect(ctx, "DELETE", path);
+    });
+};
 exports.clearLock = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const { appId } = ctx.params;
     try {

package/dist/api/controllers/templates.js

@@ -15,9 +15,24 @@ const DEFAULT_TEMPLATES_BUCKET = "prod-budi-templates.s3-eu-west-1.amazonaws.com
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const { type = "app" } = ctx.query;
-        const response = yield fetch(`https://${DEFAULT_TEMPLATES_BUCKET}/manifest.json`);
-        const json = yield response.json();
-        ctx.body = Object.values(json.templates[type]);
+        let response, error = false;
+        try {
+            response = yield fetch(`https://${DEFAULT_TEMPLATES_BUCKET}/manifest.json`);
+            if (response.status !== 200) {
+                error = true;
+            }
+        }
+        catch (err) {
+            error = true;
+        }
+        // if there is an error, simply return no templates
+        if (!error && response) {
+            const json = yield response.json();
+            ctx.body = Object.values(json.templates[type]);
+        }
+        else {
+            ctx.body = [];
+        }
     });
 };
 // can't currently test this, have to ignore from coverage

package/dist/api/routes/dev.js

@@ -5,11 +5,15 @@ const env = require("../../environment");
 const authorized = require("../../middleware/authorized");
 const { BUILDER } = require("@budibase/auth/permissions");
 const router = Router();
-if (env.isDev() || env.isTest()) {
+function redirectPath(path) {
     router
-        .get("/api/global/:devPath(.*)", controller.redirectGet)
-        .post("/api/global/:devPath(.*)", controller.redirectPost)
-        .delete("/api/global/:devPath(.*)", controller.redirectDelete);
+        .get(`/api/${path}/:devPath(.*)`, controller.buildRedirectGet(path))
+        .post(`/api/${path}/:devPath(.*)`, controller.buildRedirectPost(path))
+        .delete(`/api/${path}/:devPath(.*)`, controller.buildRedirectDelete(path));
+}
+if (env.isDev() || env.isTest()) {
+    redirectPath("global");
+    redirectPath("system");
 }
 router
     .get("/api/dev/version", authorized(BUILDER), controller.getBudibaseVersion)

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.165-alpha.1",
+    "version": "0.9.167-alpha.1",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -68,9 +68,9 @@
     "author": "Budibase",
     "license": "AGPL-3.0-or-later",
     "dependencies": {
-        "@budibase/auth": "^0.9.165-alpha.1",
-        "@budibase/client": "^0.9.165-alpha.1",
-        "@budibase/string-templates": "^0.9.165-alpha.1",
+        "@budibase/auth": "^0.9.167-alpha.1",
+        "@budibase/client": "^0.9.167-alpha.1",
+        "@budibase/string-templates": "^0.9.167-alpha.1",
         "@elastic/elasticsearch": "7.10.0",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",