npm - @budibase/server - Versions diffs - 2.1.22-alpha.6 → 2.1.22-alpha.7 - Mend

@budibase/server 2.1.22-alpha.6 → 2.1.22-alpha.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (419) hide show

package/coverage/lcov-report/src/sdk/app/backups/imports.ts.html CHANGED Viewed

@@ -266,10 +266,8 @@
 <a name='L201'></a><a href='#L201'>201</a>
 <a name='L202'></a><a href='#L202'>202</a>
 <a name='L203'></a><a href='#L203'>203</a>
-<a name='L204'></a><a href='#L204'>204</a>
-<a name='L205'></a><a href='#L205'>205</a>
-<a name='L206'></a><a href='#L206'>206</a>
-<a name='L207'></a><a href='#L207'>207</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">46x</span>
+<a name='L204'></a><a href='#L204'>204</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">46x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-yes">46x</span>
@@ -288,7 +286,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -302,9 +299,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -476,6 +470,7 @@
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { db as dbCore } from "@budibase/backend-core"
+import { Database } from "@budibase/types"
 import { getAutomationParams, TABLE_ROW_PREFIX } from "../../../db/utils"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
 import { DB_EXPORT_FILE, GLOBAL_DB_EXPORT_FILE } from "./constants"
@@ -494,7 +489,6 @@ import {
   CouchFindOptions,
   RowAttachment,
 } from "@budibase/types"
-import PouchDB from "pouchdb"
 const uuid = require("uuid/v4")
 const tar = require("tar")
 &nbsp;
@@ -506,10 +500,7 @@ type TemplateType = {
   key?: string
 }
 &nbsp;
-async function updateAttachmentColumns(
-  prodAppId: string,
-  db: PouchDB.Database
-) {
+async function updateAttachmentColumns(prodAppId: string, db: Database) {
   // iterate through attachment documents and update them
   const tables = await sdk.tables.getAllInternalTables(db)
   for (let table of tables) {
@@ -563,7 +554,7 @@ async function updateAttachmentColumns(
   }
 }
 &nbsp;
-async function updateAutomations(prodAppId: string, db: PouchDB.Database) {
+async function updateAutomations(prodAppId: string, db: Database) {
   const automations = (
     await db.allDocs(
       getAutomationParams(null, {
@@ -631,7 +622,7 @@ export function <span class="fstat-no" title="function not covered" >getListOfAp
 &nbsp;
 export async function importApp(
   appId: string,
-  db: PouchDB.Database,
+  db: Database,
   template: TemplateType
 ) {
   let prodAppId = dbCore.getProdAppID(appId)
@@ -688,7 +679,7 @@ export async function importApp(
             <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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/sdk/app/backups/index.html CHANGED Viewed

@@ -161,7 +161,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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/sdk/app/backups/index.ts.html CHANGED Viewed

@@ -97,7 +97,7 @@ export default {
             <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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/sdk/app/backups/statistics.ts.html CHANGED Viewed

@@ -132,18 +132,9 @@
 <a name='L67'></a><a href='#L67'>67</a>
 <a name='L68'></a><a href='#L68'>68</a>
 <a name='L69'></a><a href='#L69'>69</a>
-<a name='L70'></a><a href='#L70'>70</a>
-<a name='L71'></a><a href='#L71'>71</a>
-<a name='L72'></a><a href='#L72'>72</a>
-<a name='L73'></a><a href='#L73'>73</a>
-<a name='L74'></a><a href='#L74'>74</a>
-<a name='L75'></a><a href='#L75'>75</a>
-<a name='L76'></a><a href='#L76'>76</a>
-<a name='L77'></a><a href='#L77'>77</a>
-<a name='L78'></a><a href='#L78'>78</a>
-<a name='L79'></a><a href='#L79'>79</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">46x</span>
-<span class="cline-any cline-yes">46x</span>
+<a name='L70'></a><a href='#L70'>70</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -163,9 +154,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">46x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -178,9 +166,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">46x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -192,9 +177,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">46x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -220,15 +202,15 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { context, db as dbCore } from "@budibase/backend-core"
+import { Database } from "@budibase/types"
 import {
   getDatasourceParams,
   getTableParams,
   getAutomationParams,
   getScreenParams,
 } from "../../../db/utils"
-import PouchDB from "pouchdb"
 &nbsp;
-async function <span class="fstat-no" title="function not covered" >runInContext(</span>appId: string, cb: any, db?: PouchDB.Database) {
+async function <span class="fstat-no" title="function not covered" >runInContext(</span>appId: string, cb: any, db?: Database) {
 <span class="cstat-no" title="statement not covered" >  if (db) {</span>
 <span class="cstat-no" title="statement not covered" >    return cb(db)</span>
   } else {
@@ -240,13 +222,10 @@ async function <span class="fstat-no" title="function not covered" >runInContext
   }
 }
 &nbsp;
-export async function <span class="fstat-no" title="function not covered" >calculateDatasourceCount(</span>
-  appId: string,
-  db?: PouchDB.Database
-) {
+export async function <span class="fstat-no" title="function not covered" >calculateDatasourceCount(</span>appId: string, db?: Database) {
 <span class="cstat-no" title="statement not covered" >  return runInContext(</span>
     appId,
-<span class="fstat-no" title="function not covered" >    async (d</span>b: PouchDB.Database) =&gt;<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" > {</span></span>
+<span class="fstat-no" title="function not covered" >    async (d</span>b: Database) =&gt;<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" > {</span></span>
       const datasourceList = <span class="cstat-no" title="statement not covered" >await db.allDocs(getDatasourceParams())</span>
       const tableList = <span class="cstat-no" title="statement not covered" >await db.allDocs(getTableParams())</span>
 <span class="cstat-no" title="statement not covered" >      return datasourceList.rows.length + tableList.rows.length</span>
@@ -255,13 +234,10 @@ export async function <span class="fstat-no" title="function not covered" >calcu
   )
 }
 &nbsp;
-export async function <span class="fstat-no" title="function not covered" >calculateAutomationCount(</span>
-  appId: string,
-  db?: PouchDB.Database
-) {
+export async function <span class="fstat-no" title="function not covered" >calculateAutomationCount(</span>appId: string, db?: Database) {
 <span class="cstat-no" title="statement not covered" >  return runInContext(</span>
     appId,
-<span class="fstat-no" title="function not covered" >    async (d</span>b: PouchDB.Database) =&gt;<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" > {</span></span>
+<span class="fstat-no" title="function not covered" >    async (d</span>b: Database) =&gt;<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" > {</span></span>
       const automationList = <span class="cstat-no" title="statement not covered" >await db.allDocs(getAutomationParams())</span>
 <span class="cstat-no" title="statement not covered" >      return automationList.rows.length</span>
     },
@@ -269,13 +245,10 @@ export async function <span class="fstat-no" title="function not covered" >calcu
   )
 }
 &nbsp;
-export async function <span class="fstat-no" title="function not covered" >calculateScreenCount(</span>
-  appId: string,
-  db?: PouchDB.Database
-) {
+export async function <span class="fstat-no" title="function not covered" >calculateScreenCount(</span>appId: string, db?: Database) {
 <span class="cstat-no" title="statement not covered" >  return runInContext(</span>
     appId,
-<span class="fstat-no" title="function not covered" >    async (d</span>b: PouchDB.Database) =&gt;<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" > {</span></span>
+<span class="fstat-no" title="function not covered" >    async (d</span>b: Database) =&gt;<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" > {</span></span>
       const screenList = <span class="cstat-no" title="statement not covered" >await db.allDocs(getScreenParams())</span>
 <span class="cstat-no" title="statement not covered" >      return screenList.rows.length</span>
     },
@@ -284,7 +257,7 @@ export async function <span class="fstat-no" title="function not covered" >calcu
 }
 &nbsp;
 export async function <span class="fstat-no" title="function not covered" >calculateBackupStats(</span>appId: string) {
-<span class="cstat-no" title="statement not covered" >  return runInContext(appId, <span class="fstat-no" title="function not covered" >async (d</span>b: PouchDB.Database) =&gt;<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" > {</span></span></span>
+<span class="cstat-no" title="statement not covered" >  return runInContext(appId, <span class="fstat-no" title="function not covered" >async (d</span>b: Database) =&gt;<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" > {</span></span></span>
     const promises = <span class="cstat-no" title="statement not covered" >[]</span>
 <span class="cstat-no" title="statement not covered" >    promises.push(calculateDatasourceCount(appId, db))</span>
 <span class="cstat-no" title="statement not covered" >    promises.push(calculateAutomationCount(appId, db))</span>
@@ -304,7 +277,7 @@ export async function <span class="fstat-no" title="function not covered" >calcu
             <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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/sdk/app/tables/index.html CHANGED Viewed

@@ -101,7 +101,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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/sdk/app/tables/index.ts.html CHANGED Viewed

@@ -123,8 +123,7 @@
 <a name='L58'></a><a href='#L58'>58</a>
 <a name='L59'></a><a href='#L59'>59</a>
 <a name='L60'></a><a href='#L60'>60</a>
-<a name='L61'></a><a href='#L61'>61</a>
-<a name='L62'></a><a href='#L62'>62</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">46x</span>
+<a name='L61'></a><a href='#L61'>61</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -134,7 +133,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">271x</span>
 <span class="cline-any cline-yes">268x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -185,19 +183,18 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { getAppDB } from "@budibase/backend-core/context"
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { context } from "@budibase/backend-core"
 import { BudibaseInternalDB, getTableParams } from "../../../db/utils"
 import {
   breakExternalTableId,
   isExternalTable,
   isSQL,
 } from "../../../integrations/utils"
-import { Table } from "@budibase/types"
-import PouchDB from "pouchdb"
+import { Table, Database } from "@budibase/types"
 &nbsp;
-async function getAllInternalTables(db?: PouchDB.Database): Promise&lt;Table[]&gt; {
+async function getAllInternalTables(db?: Database): Promise&lt;Table[]&gt; {
   if (!db) {
-    db = getAppDB() as PouchDB.Database
+    db = context.getAppDB()
   }
   const internalTables = await db.allDocs(
     getTableParams(null, {
@@ -212,7 +209,7 @@ async function getAllInternalTables(db?: PouchDB.Database): Promise&lt;Table[]&g
 }
 &nbsp;
 async function <span class="fstat-no" title="function not covered" >getAllExternalTables(</span>datasourceId: any): Promise&lt;Table[]&gt; {
-  const db = <span class="cstat-no" title="statement not covered" >getAppDB()</span>
+  const db = <span class="cstat-no" title="statement not covered" >context.getAppDB()</span>
   const datasource = <span class="cstat-no" title="statement not covered" >await db.get(datasourceId)</span>
 <span class="cstat-no" title="statement not covered" >  <span class="missing-if-branch" title="if path not taken" >I</span>if (!datasource || !datasource.entities) {</span>
 <span class="cstat-no" title="statement not covered" >    throw "Datasource is not configured fully."</span>
@@ -229,7 +226,7 @@ async function <span class="fstat-no" title="function not covered" >getExternalT
 }
 &nbsp;
 async function getTable(tableId: any): Promise&lt;Table&gt; {
-  const db = getAppDB()
+  const db = context.getAppDB()
   <span class="missing-if-branch" title="if path not taken" >I</span>if (isExternalTable(tableId)) {
     let { datasourceId, tableName } = <span class="cstat-no" title="statement not covered" >breakExternalTableId(tableId)</span>
     const datasource = <span class="cstat-no" title="statement not covered" >await db.get(datasourceId)</span>
@@ -253,7 +250,7 @@ export default {
             <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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/sdk/index.html CHANGED Viewed

@@ -101,7 +101,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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/sdk/index.ts.html CHANGED Viewed

@@ -115,7 +115,7 @@ module.exports = sdk
             <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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/startup.ts.html CHANGED Viewed

@@ -484,7 +484,7 @@ export async function startup(app?: any, server?: any) {
             <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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/tests/utilities/TestConfiguration.js.html CHANGED Viewed

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">93.42% </span>
+                <span class="strong">94.36% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>199/213</span>
+                <span class='fraction'>201/213</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">82.14% </span>
+                <span class="strong">82.85% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>115/140</span>
+                <span class='fraction'>116/140</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">92.45% </span>
+                <span class="strong">94.33% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>49/53</span>
+                <span class='fraction'>50/53</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">93.39% </span>
+                <span class="strong">94.33% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>198/212</span>
+                <span class='fraction'>200/212</span>
             </div>
@@ -747,11 +747,11 @@
 <span class="cline-any cline-yes">961x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">961x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">444x</span>
+<span class="cline-any cline-yes">444x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">961x</span>
+<span class="cline-any cline-yes">517x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1273,7 +1273,7 @@ const {
 const controllers = require("./controllers")
 const supertest = require("supertest")
 const { cleanup } = require("../../utilities/fileSystem")
-const { Cookies, Headers } = require("@budibase/backend-core/constants")
+const { Cookie, Header } = require("@budibase/backend-core/constants")
 const { jwt } = require("@budibase/backend-core/auth")
 const { doInTenant, doWithGlobalDB } = require("@budibase/backend-core/tenancy")
 const { createASession } = require("@budibase/backend-core/sessions")
@@ -1342,9 +1342,9 @@ class TestConfiguration {
     }
     return doInTenant(TENANT_ID, () =&gt; {
       // check if already in a context
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (context.getAppId() == null &amp;&amp; appId !== null) {
-<span class="cstat-no" title="statement not covered" >        return context.doInAppContext(appId, <span class="fstat-no" title="function not covered" >as</span>ync () =&gt; {</span>
-<span class="cstat-no" title="statement not covered" >          return task()</span>
+      if (context.getAppId() == null &amp;&amp; appId !== null) {
+        return context.doInAppContext(appId, async () =&gt; {
+          return task()
         })
       } else {
         return task()
@@ -1513,10 +1513,10 @@ class TestConfiguration {
       return {
         Accept: "application/json",
         Cookie: [
-          `${Cookies.Auth}=${authToken}`,
-          `${Cookies.CurrentApp}=${appToken}`,
+          `${Cookie.Auth}=${authToken}`,
+          `${Cookie.CurrentApp}=${appToken}`,
         ],
-        [Headers.APP_ID]: appId,
+        [Header.APP_ID]: appId,
       }
     })
   }
@@ -1536,14 +1536,14 @@ class TestConfiguration {
     const headers = {
       Accept: "application/json",
       Cookie: [
-        `${Cookies.Auth}=${authToken}`,
-        `${Cookies.CurrentApp}=${appToken}`,
+        `${Cookie.Auth}=${authToken}`,
+        `${Cookie.CurrentApp}=${appToken}`,
       ],
-      [Headers.CSRF_TOKEN]: CSRF_TOKEN,
+      [Header.CSRF_TOKEN]: CSRF_TOKEN,
       ...extras,
     }
     <span class="missing-if-branch" title="else path not taken" >E</span>if (this.appId) {
-      headers[Headers.APP_ID] = this.appId
+      headers[Header.APP_ID] = this.appId
     }
     return headers
   }
@@ -1555,7 +1555,7 @@ class TestConfiguration {
       Accept: "application/json",
     }
     <span class="missing-if-branch" title="else path not taken" >E</span>if (appId) {
-      headers[Headers.APP_ID] = appId
+      headers[Header.APP_ID] = appId
     }
     return headers
   }
@@ -1858,7 +1858,7 @@ module.exports = TestConfiguration
             <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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/tests/utilities/controllers.js.html CHANGED Viewed

@@ -118,7 +118,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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/tests/utilities/index.html CHANGED Viewed

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">93.75% </span>
+                <span class="strong">94.48% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>255/272</span>
+                <span class='fraction'>257/272</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">82% </span>
+                <span class="strong">82.66% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>123/150</span>
+                <span class='fraction'>124/150</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">93.05% </span>
+                <span class="strong">94.44% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>67/72</span>
+                <span class='fraction'>68/72</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">93.72% </span>
+                <span class="strong">94.46% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>254/271</span>
+                <span class='fraction'>256/271</span>
             </div>
@@ -80,17 +80,17 @@
 </thead>
 <tbody><tr>
 	<td class="file high" data-value="TestConfiguration.js"><a href="TestConfiguration.js.html">TestConfiguration.js</a></td>
-	<td data-value="93.42" class="pic high">
-	<div class="chart"><div class="cover-fill" style="width: 93%"></div><div class="cover-empty" style="width: 7%"></div></div>
+	<td data-value="94.36" class="pic high">
+	<div class="chart"><div class="cover-fill" style="width: 94%"></div><div class="cover-empty" style="width: 6%"></div></div>
 	</td>
-	<td data-value="93.42" class="pct high">93.42%</td>
-	<td data-value="213" class="abs high">199/213</td>
-	<td data-value="82.14" class="pct high">82.14%</td>
-	<td data-value="140" class="abs high">115/140</td>
-	<td data-value="92.45" class="pct high">92.45%</td>
-	<td data-value="53" class="abs high">49/53</td>
-	<td data-value="93.39" class="pct high">93.39%</td>
-	<td data-value="212" class="abs high">198/212</td>
+	<td data-value="94.36" class="pct high">94.36%</td>
+	<td data-value="213" class="abs high">201/213</td>
+	<td data-value="82.85" class="pct high">82.85%</td>
+	<td data-value="140" class="abs high">116/140</td>
+	<td data-value="94.33" class="pct high">94.33%</td>
+	<td data-value="53" class="abs high">50/53</td>
+	<td data-value="94.33" class="pct high">94.33%</td>
+	<td data-value="212" class="abs high">200/212</td>
 	</tr>
 <tr>
@@ -146,7 +146,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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/tests/utilities/index.js.html CHANGED Viewed

@@ -103,7 +103,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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/tests/utilities/structures.js.html CHANGED Viewed

@@ -442,7 +442,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
-const { BUILTIN_PERMISSION_IDS } = require("@budibase/backend-core/permissions")
+const { BuiltinPermissionID } = require("@budibase/backend-core/permissions")
 const { createHomeScreen } = require("../../constants/screens")
 const { EMPTY_LAYOUT } = require("../../constants/layouts")
 const { cloneDeep } = require("lodash/fp")
@@ -578,7 +578,7 @@ exports.basicRole = () =&gt; {
   return {
     name: "NewRole",
     inherits: BUILTIN_ROLE_IDS.BASIC,
-    permissionId: BUILTIN_PERMISSION_IDS.READ_ONLY,
+    permissionId: BuiltinPermissionID.READ_ONLY,
   }
 }
 &nbsp;
@@ -637,7 +637,7 @@ exports.basicWebhook = automationId =&gt; {
             <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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/threads/automation.ts.html CHANGED Viewed

@@ -1193,7 +1193,7 @@ class Orchestrator {
   }
 &nbsp;
   async <span class="fstat-no" title="function not covered" >getMetadata(</span>): Promise&lt;AutomationMetadata&gt; {
-    const metadataId = <span class="cstat-no" title="statement not covered" >generateAutomationMetadataID(this._automation._id)</span>
+    const metadataId = <span class="cstat-no" title="statement not covered" >generateAutomationMetadataID(this._automation._id!)</span>
     const db = <span class="cstat-no" title="statement not covered" >getAppDB()</span>
     let metadata: AutomationMetadata
 <span class="cstat-no" title="statement not covered" >    try {</span>
@@ -1582,7 +1582,7 @@ export const removeStalled = <span class="fstat-no" title="function not covered"
             <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 Wed Nov 16 2022 13:32:43 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 17 2022 17:01:08 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>