@budibase/server 1.3.15-alpha.1 → 1.3.15-alpha.4

package/coverage/lcov-report/utilities/security.js.html

@@ -283,7 +283,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 19:08:44 GMT+0000 (Coordinated Universal Time)
+                at Tue Sep 13 2022 10:28:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/statusCodes.js.html

@@ -91,7 +91,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 19:08:44 GMT+0000 (Coordinated Universal Time)
+                at Tue Sep 13 2022 10:28:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 19:08:44 GMT+0000 (Coordinated Universal Time)
+                at Tue Sep 13 2022 10:28:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -310,7 +310,7 @@ exports.getUniqueRows = async appIds => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 19:08:44 GMT+0000 (Coordinated Universal Time)
+                at Tue Sep 13 2022 10:28:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -124,7 +124,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 19:08:44 GMT+0000 (Coordinated Universal Time)
+                at Tue Sep 13 2022 10:28:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/users.js.html

@@ -205,7 +205,7 @@ exports.publicApiUserFix = ctx => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 19:08:44 GMT+0000 (Coordinated Universal Time)
+                at Tue Sep 13 2022 10:28:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -535,7 +535,7 @@ exports.getChecklist = <span class="fstat-no" title="function not covered" >as</
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Sep 12 2022 19:08:44 GMT+0000 (Coordinated Universal Time)
+                at Tue Sep 13 2022 10:28:55 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -563,42 +563,44 @@ FN:16,(anonymous_0)
 FN:24,(anonymous_1)
 FN:38,(anonymous_2)
 FN:50,(anonymous_3)
-FN:70,(anonymous_4)
+FN:62,(anonymous_4)
 FN:84,(anonymous_5)
-FN:86,(anonymous_6)
-FN:99,(anonymous_7)
-FN:128,(anonymous_8)
-FN:165,(anonymous_9)
-FN:173,(anonymous_10)
-FN:188,(anonymous_11)
-FN:194,(anonymous_12)
-FN:203,getErrorTables
-FN:205,(anonymous_14)
-FN:206,(anonymous_15)
-FN:209,updateError
-FN:220,(anonymous_17)
+FN:98,(anonymous_6)
+FN:100,(anonymous_7)
+FN:113,(anonymous_8)
+FN:142,(anonymous_9)
+FN:179,(anonymous_10)
+FN:187,(anonymous_11)
+FN:202,(anonymous_12)
+FN:208,(anonymous_13)
+FN:217,getErrorTables
+FN:219,(anonymous_15)
+FN:220,(anonymous_16)
+FN:223,updateError
 FN:234,(anonymous_18)
-FNF:19
+FN:247,(anonymous_19)
+FNF:20
 FNH:11
 FNDA:2,(anonymous_0)
 FNDA:2,(anonymous_1)
 FNDA:1,(anonymous_2)
 FNDA:0,(anonymous_3)
-FNDA:6,(anonymous_4)
-FNDA:1,(anonymous_5)
-FNDA:0,(anonymous_6)
-FNDA:6,(anonymous_7)
-FNDA:64,(anonymous_8)
-FNDA:1,(anonymous_9)
+FNDA:0,(anonymous_4)
+FNDA:6,(anonymous_5)
+FNDA:1,(anonymous_6)
+FNDA:0,(anonymous_7)
+FNDA:6,(anonymous_8)
+FNDA:64,(anonymous_9)
 FNDA:1,(anonymous_10)
 FNDA:1,(anonymous_11)
 FNDA:1,(anonymous_12)
+FNDA:1,(anonymous_13)
 FNDA:0,getErrorTables
-FNDA:0,(anonymous_14)
 FNDA:0,(anonymous_15)
+FNDA:0,(anonymous_16)
 FNDA:0,updateError
-FNDA:0,(anonymous_17)
 FNDA:0,(anonymous_18)
+FNDA:0,(anonymous_19)
 DA:8,45
 DA:9,45
 DA:10,45
@@ -620,175 +622,190 @@ DA:47,2
 DA:50,45
 DA:51,0
 DA:52,0
-DA:54,0
+DA:53,0
 DA:55,0
+DA:56,0
 DA:57,0
 DA:58,0
 DA:60,0
 DA:61,0
 DA:62,0
 DA:64,0
-DA:70,45
-DA:71,6
-DA:72,6
-DA:73,6
-DA:75,6
-DA:76,5
-DA:79,1
-DA:81,0
-DA:84,1
-DA:85,1
-DA:87,0
-DA:91,1
-DA:92,1
-DA:96,1
-DA:99,45
-DA:100,6
-DA:101,6
-DA:102,6
-DA:103,6
-DA:104,6
-DA:105,6
-DA:106,6
-DA:108,0
-DA:111,6
-DA:112,6
-DA:113,6
+DA:68,0
+DA:71,0
+DA:72,0
+DA:74,0
+DA:75,0
+DA:76,0
+DA:78,0
+DA:84,45
+DA:85,6
+DA:86,6
+DA:87,6
+DA:89,6
+DA:90,5
+DA:93,1
+DA:95,0
+DA:98,1
+DA:99,1
+DA:101,0
+DA:105,1
+DA:106,1
+DA:110,1
+DA:113,45
+DA:114,6
+DA:115,6
 DA:116,6
 DA:117,6
 DA:118,6
-DA:119,0
-DA:123,6
-DA:124,6
+DA:119,6
+DA:120,6
+DA:122,0
 DA:125,6
-DA:128,45
-DA:129,64
-DA:130,64
-DA:131,64
-DA:133,64
-DA:139,64
-DA:140,64
-DA:141,0
-DA:142,0
-DA:143,0
-DA:146,64
+DA:126,6
+DA:127,6
+DA:130,6
+DA:131,6
+DA:132,6
+DA:133,0
+DA:137,6
+DA:138,6
+DA:139,6
+DA:142,45
+DA:143,64
+DA:144,64
+DA:145,64
 DA:147,64
-DA:148,64
-DA:151,64
-DA:152,64
-DA:153,63
-DA:154,0
-DA:158,63
-DA:159,63
-DA:160,0
-DA:162,63
-DA:165,45
-DA:166,1
-DA:167,1
-DA:169,1
-DA:171,1
-DA:172,1
-DA:173,1
+DA:153,64
+DA:154,64
+DA:155,0
+DA:156,0
+DA:157,0
+DA:160,64
+DA:161,64
+DA:162,64
+DA:165,64
+DA:166,64
+DA:167,63
+DA:168,0
+DA:172,63
+DA:173,63
+DA:174,0
+DA:176,63
+DA:179,45
+DA:180,1
 DA:181,1
-DA:182,1
-DA:184,1
+DA:183,1
 DA:185,1
-DA:188,45
-DA:189,1
-DA:190,1
-DA:194,45
+DA:186,1
+DA:187,1
 DA:195,1
 DA:196,1
-DA:197,1
-DA:199,0
-DA:204,0
-DA:205,0
-DA:206,0
-DA:210,0
-DA:211,0
+DA:198,1
+DA:199,1
+DA:202,45
+DA:203,1
+DA:204,1
+DA:208,45
+DA:209,1
+DA:210,1
+DA:211,1
 DA:213,0
-DA:214,0
-DA:216,0
-DA:217,0
-DA:220,45
-DA:221,0
+DA:218,0
+DA:219,0
+DA:220,0
 DA:224,0
 DA:225,0
-DA:226,0
-DA:229,0
+DA:227,0
+DA:228,0
 DA:230,0
 DA:231,0
-DA:233,0
-DA:234,0
-DA:236,0
-DA:237,0
-DA:241,0
+DA:234,45
+DA:235,0
+DA:238,0
+DA:239,0
 DA:242,0
 DA:243,0
 DA:244,0
-DA:245,0
 DA:246,0
 DA:247,0
-DA:253,0
+DA:249,0
+DA:250,0
 DA:254,0
 DA:255,0
-DA:262,0
-LF:134
+DA:256,0
+DA:257,0
+DA:258,0
+DA:259,0
+DA:260,0
+DA:266,0
+DA:267,0
+DA:268,0
+DA:275,0
+LF:141
 LH:82
 BRDA:41,0,0,0
 BRDA:41,0,1,1
 BRDA:41,1,0,1
 BRDA:41,1,1,1
-BRDA:61,2,0,0
-BRDA:61,2,1,0
-BRDA:75,3,0,5
-BRDA:75,3,1,1
-BRDA:79,4,0,0
-BRDA:79,4,1,1
-BRDA:87,5,0,0
-BRDA:87,5,1,0
-BRDA:87,5,2,0
-BRDA:91,6,0,1
-BRDA:91,6,1,0
-BRDA:106,7,0,0
-BRDA:106,7,1,6
-BRDA:106,8,0,6
-BRDA:106,8,1,0
-BRDA:116,9,0,6
-BRDA:116,9,1,0
-BRDA:118,10,0,0
-BRDA:118,10,1,6
-BRDA:118,11,0,6
-BRDA:118,11,1,6
-BRDA:135,12,0,0
-BRDA:135,12,1,64
-BRDA:140,13,0,0
-BRDA:140,13,1,64
-BRDA:151,14,0,64
-BRDA:151,14,1,0
-BRDA:153,15,0,0
-BRDA:153,15,1,63
-BRDA:153,16,0,63
-BRDA:153,16,1,63
-BRDA:159,17,0,0
-BRDA:159,17,1,63
-BRDA:210,18,0,0
-BRDA:210,18,1,0
-BRDA:213,19,0,0
-BRDA:213,19,1,0
-BRDA:230,20,0,0
-BRDA:230,20,1,0
-BRDA:236,21,0,0
-BRDA:236,21,1,0
-BRDA:243,22,0,0
-BRDA:243,22,1,0
-BRDA:243,23,0,0
-BRDA:243,23,1,0
-BRDA:246,24,0,0
-BRDA:246,24,1,0
-BRDA:253,25,0,0
-BRDA:253,25,1,0
-BRF:53
+BRDA:56,2,0,0
+BRDA:56,2,1,0
+BRDA:57,3,0,0
+BRDA:57,3,1,0
+BRDA:61,4,0,0
+BRDA:61,4,1,0
+BRDA:75,5,0,0
+BRDA:75,5,1,0
+BRDA:89,6,0,5
+BRDA:89,6,1,1
+BRDA:93,7,0,0
+BRDA:93,7,1,1
+BRDA:101,8,0,0
+BRDA:101,8,1,0
+BRDA:101,8,2,0
+BRDA:105,9,0,1
+BRDA:105,9,1,0
+BRDA:120,10,0,0
+BRDA:120,10,1,6
+BRDA:120,11,0,6
+BRDA:120,11,1,0
+BRDA:130,12,0,6
+BRDA:130,12,1,0
+BRDA:132,13,0,0
+BRDA:132,13,1,6
+BRDA:132,14,0,6
+BRDA:132,14,1,6
+BRDA:149,15,0,0
+BRDA:149,15,1,64
+BRDA:154,16,0,0
+BRDA:154,16,1,64
+BRDA:165,17,0,64
+BRDA:165,17,1,0
+BRDA:167,18,0,0
+BRDA:167,18,1,63
+BRDA:167,19,0,63
+BRDA:167,19,1,63
+BRDA:173,20,0,0
+BRDA:173,20,1,63
+BRDA:224,21,0,0
+BRDA:224,21,1,0
+BRDA:227,22,0,0
+BRDA:227,22,1,0
+BRDA:242,23,0,0
+BRDA:242,23,1,0
+BRDA:243,24,0,0
+BRDA:243,24,1,0
+BRDA:249,25,0,0
+BRDA:249,25,1,0
+BRDA:256,26,0,0
+BRDA:256,26,1,0
+BRDA:256,27,0,0
+BRDA:256,27,1,0
+BRDA:259,28,0,0
+BRDA:259,28,1,0
+BRDA:266,29,0,0
+BRDA:266,29,1,0
+BRF:61
 BRH:20
 end_of_record
 TN:
@@ -1399,9 +1416,9 @@ FN:54,(anonymous_3)
 FN:55,(anonymous_4)
 FN:66,(anonymous_5)
 FN:67,(anonymous_6)
-FN:95,(anonymous_7)
-FN:109,(anonymous_8)
-FN:121,(anonymous_9)
+FN:96,(anonymous_7)
+FN:110,(anonymous_8)
+FN:122,(anonymous_9)
 FNF:10
 FNH:6
 FNDA:1,(anonymous_0)
@@ -1447,29 +1464,29 @@ DA:66,0
 DA:67,0
 DA:68,0
 DA:69,0
-DA:78,0
 DA:79,0
-DA:83,24
-DA:84,23
-DA:86,24
+DA:80,0
+DA:84,24
+DA:85,23
 DA:87,24
-DA:95,44
-DA:96,1
+DA:88,24
+DA:96,44
 DA:97,1
 DA:98,1
-DA:100,1
-DA:102,1
+DA:99,1
+DA:101,1
 DA:103,1
-DA:106,1
-DA:109,44
-DA:110,48
-DA:111,0
-DA:113,48
-DA:114,0
+DA:104,1
+DA:107,1
+DA:110,44
+DA:111,48
+DA:112,0
+DA:114,48
 DA:115,0
-DA:118,48
-DA:119,24
-DA:121,24
+DA:116,0
+DA:119,48
+DA:120,24
+DA:122,24
 LF:56
 LH:40
 BRDA:35,0,0,23
@@ -1482,20 +1499,20 @@ BRDA:64,3,0,0
 BRDA:64,3,1,0
 BRDA:67,4,0,0
 BRDA:67,4,1,0
-BRDA:78,5,0,0
-BRDA:78,5,1,0
-BRDA:83,6,0,23
-BRDA:83,6,1,1
-BRDA:110,7,0,0
-BRDA:110,7,1,48
-BRDA:113,8,0,0
-BRDA:113,8,1,48
-BRDA:114,9,0,0
-BRDA:114,9,1,0
-BRDA:118,10,0,24
-BRDA:118,10,1,24
-BRDA:118,11,0,48
-BRDA:118,11,1,48
+BRDA:79,5,0,0
+BRDA:79,5,1,0
+BRDA:84,6,0,23
+BRDA:84,6,1,1
+BRDA:111,7,0,0
+BRDA:111,7,1,48
+BRDA:114,8,0,0
+BRDA:114,8,1,48
+BRDA:115,9,0,0
+BRDA:115,9,1,0
+BRDA:119,10,0,24
+BRDA:119,10,1,24
+BRDA:119,11,0,48
+BRDA:119,11,1,48
 BRF:24
 BRH:11
 end_of_record

package/dist/api/controllers/datasource.js

@@ -41,8 +41,21 @@ exports.buildSchemaFromDb = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB();
         const datasource = yield db.get(ctx.params.datasourceId);
-        const { tables, error } = yield buildSchemaHelper(datasource);
-        datasource.entities = tables;
+        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 dbResp = yield db.put(datasource);
         datasource._rev = dbResp.rev;
         const response = { datasource };
@@ -188,13 +201,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);
     // 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(datasource.entities)) {
+    for (let entity of Object.values((_a = datasource.entities) !== null && _a !== void 0 ? _a : {})) {
         if (entity.primaryDisplay) {
             continue;
         }

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

@@ -22,6 +22,7 @@ const utils_1 = require("../../../db/utils");
 const objectStore_1 = require("@budibase/backend-core/objectStore");
 const types_1 = require("@budibase/types");
 const environment_1 = __importDefault(require("../../../environment"));
+const websocket_1 = require("../../../websocket");
 function getPlugins(type) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = (0, tenancy_1.getGlobalDB)();
@@ -134,7 +135,7 @@ exports.destroy = destroy;
 function storePlugin(metadata, directory, source) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = (0, tenancy_1.getGlobalDB)();
-        const version = metadata.package.version, name = metadata.package.name, description = metadata.package.description;
+        const version = metadata.package.version, name = metadata.package.name, description = metadata.package.description, hash = metadata.schema.hash;
         // first open the tarball into tmp directory
         const bucketPath = `${name}/`;
         const files = yield (0, objectStore_1.uploadDirectory)(constants_1.ObjectStoreBuckets.PLUGINS, directory, bucketPath);
@@ -168,11 +169,13 @@ function storePlugin(metadata, directory, source) {
         }
         let doc = Object.assign(Object.assign({ _id: pluginId, _rev: rev }, metadata), { name,
             version,
+            hash,
             description, jsUrl: `${bucketPath}${jsFileName}` });
         if (source) {
             doc = Object.assign(Object.assign({}, doc), { source });
         }
         const response = yield db.put(doc);
+        websocket_1.ClientAppSocket.emit("plugin-update", { name, hash });
         return Object.assign(Object.assign({}, doc), { _rev: response.rev });
     });
 }

package/dist/api/controllers/screen.js

@@ -56,6 +56,7 @@ exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
                     name: plugin.name,
                     version: plugin.version,
                     jsUrl: plugin.jsUrl,
+                    hash: plugin.hash,
                 });
             }
         });

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

@@ -67,7 +67,8 @@
         previewDevice,
         navigation,
         hiddenComponentIds,
-        usedPlugins
+        usedPlugins,
+        location
       } = parsed
 
       // Set some flags so the app knows we're in the builder
@@ -83,6 +84,7 @@
       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/app.js

@@ -66,6 +66,7 @@ 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({
@@ -99,6 +100,7 @@ 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