@budibase/server 1.0.49-alpha.1 → 1.0.49-alpha.13

package/coverage/lcov-report/api/controllers/row/internalSearch.js.html

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">4.54% </span>
+                <span class="strong">5.16% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>7/154</span>
+                <span class='fraction'>8/155</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">4.63% </span>
+                <span class="strong">5.26% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>7/151</span>
+                <span class='fraction'>8/152</span>
             </div>
         
             
@@ -452,11 +452,10 @@
 <a name='L393'></a><a href='#L393'>393</a>
 <a name='L394'></a><a href='#L394'>394</a>
 <a name='L395'></a><a href='#L395'>395</a>
-<a name='L396'></a><a href='#L396'>396</a>
-<a name='L397'></a><a href='#L397'>397</a>
-<a name='L398'></a><a href='#L398'>398</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">36x</span>
-<span class="cline-any cline-yes">36x</span>
-<span class="cline-any cline-yes">36x</span>
+<a name='L396'></a><a href='#L396'>396</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</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>
@@ -465,7 +464,6 @@
 <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-no">&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>
@@ -698,6 +696,7 @@
 <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-no">&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>
@@ -711,7 +710,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>
-<span class="cline-any cline-yes">36x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -746,8 +745,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>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">36x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -795,8 +793,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>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">36x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -841,8 +838,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>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">36x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -854,14 +850,14 @@
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const { SearchIndexes } = require("../../../db/utils")
 const fetch = require("node-fetch")
 const { getCouchUrl } = require("@budibase/backend-core/db")
+const { getAppId } = require("@budibase/backend-core/context")
 &nbsp;
 /**
  * Class to build lucene query URLs.
  * Optionally takes a base lucene query object.
  */
 class QueryBuilder {
-<span class="fstat-no" title="function not covered" >  co</span>nstructor(appId, base) {
-<span class="cstat-no" title="statement not covered" >    this.appId = appId</span>
+<span class="fstat-no" title="function not covered" >  co</span>nstructor(base) {
 <span class="cstat-no" title="statement not covered" >    this.query = {</span>
       string: {},
       fuzzy: {},
@@ -1094,7 +1090,8 @@ class QueryBuilder {
   }
 &nbsp;
 <span class="fstat-no" title="function not covered" >  as</span>ync run() {
-    const url = <span class="cstat-no" title="statement not covered" >`${getCouchUrl()}/${this.appId}/_design/database/_search/${</span>
+    const appId = <span class="cstat-no" title="statement not covered" >getAppId()</span>
+    const url = <span class="cstat-no" title="statement not covered" >`${getCouchUrl()}/${appId}/_design/database/_search/${</span>
       SearchIndexes.ROWS
     }`
     const body = <span class="cstat-no" title="statement not covered" >this.buildSearchBody()</span>
@@ -1131,7 +1128,6 @@ const runQuery = <span class="fstat-no" title="function not covered" >as</span>y
  * Gets round the fixed limit of 200 results from a query by fetching as many
  * pages as required and concatenating the results. This recursively operates
  * until enough results have been found.
- * @param appId {string} The app ID to search
  * @param query {object} The JSON query structure
  * @param params {object} The search params including:
  *   tableId {string} The table ID to search
@@ -1144,7 +1140,7 @@ const runQuery = <span class="fstat-no" title="function not covered" >as</span>y
  *   rows {array|null} Current results in the recursive search
  * @returns {Promise&lt;*[]|*&gt;}
  */
-const recursiveSearch = <span class="fstat-no" title="function not covered" >as</span>ync (appId, query, params) =&gt; {
+const recursiveSearch = <span class="fstat-no" title="function not covered" >as</span>ync (query, params) =&gt; {
   const bookmark = <span class="cstat-no" title="statement not covered" >params.bookmark</span>
   const rows = <span class="cstat-no" title="statement not covered" >params.rows || []</span>
 <span class="cstat-no" title="statement not covered" >  if (rows.length &gt;= params.limit) {</span>
@@ -1154,7 +1150,7 @@ const recursiveSearch = <span class="fstat-no" title="function not covered" >as<
 <span class="cstat-no" title="statement not covered" >  if (rows.length &gt; params.limit - 200) {</span>
 <span class="cstat-no" title="statement not covered" >    pageSize = params.limit - rows.length</span>
   }
-  const page = <span class="cstat-no" title="statement not covered" >await new QueryBuilder(appId, query)</span>
+  const page = <span class="cstat-no" title="statement not covered" >await new QueryBuilder(query)</span>
     .setVersion(params.version)
     .setTable(params.tableId)
     .setBookmark(bookmark)
@@ -1174,14 +1170,13 @@ const recursiveSearch = <span class="fstat-no" title="function not covered" >as<
     bookmark: page.bookmark,
     rows: [...rows, ...page.rows],
   }
-<span class="cstat-no" title="statement not covered" >  return await recursiveSearch(appId, query, newParams)</span>
+<span class="cstat-no" title="statement not covered" >  return await recursiveSearch(query, newParams)</span>
 }
 &nbsp;
 /**
  * Performs a paginated search. A bookmark will be returned to allow the next
  * page to be fetched. There is a max limit off 200 results per page in a
  * paginated search.
- * @param appId {string} The app ID to search
  * @param query {object} The JSON query structure
  * @param params {object} The search params including:
  *   tableId {string} The table ID to search
@@ -1193,13 +1188,13 @@ const recursiveSearch = <span class="fstat-no" title="function not covered" >as<
  *   bookmark {string} The bookmark to resume from
  * @returns {Promise&lt;{hasNextPage: boolean, rows: *[]}&gt;}
  */
-exports.paginatedSearch = <span class="fstat-no" title="function not covered" >as</span>ync (appId, query, params) =&gt; {
+exports.paginatedSearch = <span class="fstat-no" title="function not covered" >as</span>ync (query, params) =&gt; {
   let limit = <span class="cstat-no" title="statement not covered" >params.limit</span>
 <span class="cstat-no" title="statement not covered" >  if (limit == null || isNaN(limit) || limit &lt; 0) {</span>
 <span class="cstat-no" title="statement not covered" >    limit = 50</span>
   }
 <span class="cstat-no" title="statement not covered" >  limit = Math.min(limit, 200)</span>
-  const search = <span class="cstat-no" title="statement not covered" >new QueryBuilder(appId, query)</span>
+  const search = <span class="cstat-no" title="statement not covered" >new QueryBuilder(query)</span>
     .setVersion(params.version)
     .setTable(params.tableId)
     .setSort(params.sort)
@@ -1228,7 +1223,6 @@ exports.paginatedSearch = <span class="fstat-no" title="function not covered" >a
  * desired amount of results. There is a limit of 1000 results to avoid
  * heavy performance hits, and to avoid client components breaking from
  * handling too much data.
- * @param appId {string} The app ID to search
  * @param query {object} The JSON query structure
  * @param params {object} The search params including:
  *   tableId {string} The table ID to search
@@ -1239,13 +1233,13 @@ exports.paginatedSearch = <span class="fstat-no" title="function not covered" >a
  *   limit {number} The desired number of results
  * @returns {Promise&lt;{rows: *}&gt;}
  */
-exports.fullSearch = <span class="fstat-no" title="function not covered" >as</span>ync (appId, query, params) =&gt; {
+exports.fullSearch = <span class="fstat-no" title="function not covered" >as</span>ync (query, params) =&gt; {
   let limit = <span class="cstat-no" title="statement not covered" >params.limit</span>
 <span class="cstat-no" title="statement not covered" >  if (limit == null || isNaN(limit) || limit &lt; 0) {</span>
 <span class="cstat-no" title="statement not covered" >    limit = 1000</span>
   }
 <span class="cstat-no" title="statement not covered" >  params.limit = Math.min(limit, 1000)</span>
-  const rows = <span class="cstat-no" title="statement not covered" >await recursiveSearch(appId, query, params)</span>
+  const rows = <span class="cstat-no" title="statement not covered" >await recursiveSearch(query, params)</span>
 <span class="cstat-no" title="statement not covered" >  return { rows }</span>
 }
 &nbsp;</pre></td></tr></table></pre>
@@ -1255,7 +1249,7 @@ exports.fullSearch = <span class="fstat-no" title="function not covered" >as</sp
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Jan 31 2022 16:01:47 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:27:17 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>

package/coverage/lcov-report/api/controllers/row/staticFormula.js.html

@@ -213,17 +213,16 @@
 <a name='L154'></a><a href='#L154'>154</a>
 <a name='L155'></a><a href='#L155'>155</a>
 <a name='L156'></a><a href='#L156'>156</a>
-<a name='L157'></a><a href='#L157'>157</a>
-<a name='L158'></a><a href='#L158'>158</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">37x</span>
+<a name='L157'></a><a href='#L157'>157</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">39x</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">37x</span>
-<span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">37x</span>
+<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">39x</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>
@@ -231,7 +230,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>
-<span class="cline-any cline-yes">37x</span>
+<span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-yes">77x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">77x</span>
@@ -285,7 +284,7 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">37x</span>
+<span class="cline-any cline-yes">39x</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>
@@ -324,8 +323,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>
-<span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">39x</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>
@@ -371,8 +369,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">73x</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 CouchDB = require("../../../db")
-const { getRowParams } = require("../../../db/utils")
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const { getRowParams } = require("../../../db/utils")
 const {
   outputProcessing,
   processAutoColumn,
@@ -381,6 +378,7 @@ const {
 const { FieldTypes, FormulaTypes } = require("../../../constants")
 const { isEqual } = require("lodash")
 const { cloneDeep } = require("lodash/fp")
+const { getAppDB } = require("@budibase/backend-core/context")
 &nbsp;
 /**
  * This function runs through a list of enriched rows, looks at the rows which
@@ -388,8 +386,8 @@ const { cloneDeep } = require("lodash/fp")
  * updated.
  * NOTE: this will only for affect static formulas.
  */
-exports.updateRelatedFormula = async (appId, table, enrichedRows) =&gt; {
-  const db = new CouchDB(appId)
+exports.updateRelatedFormula = async (table, enrichedRows) =&gt; {
+  const db = getAppDB()
   // no formula to update, we're done
   if (!table.relatedFormula) {
     return
@@ -430,7 +428,7 @@ exports.updateRelatedFormula = async (appId, table, enrichedRows) =&gt; {
           // re-enrich rows for all the related, don't update the related formula for them
 <span class="cstat-no" title="statement not covered" >          promises = promises.concat(</span>
             relatedRows[tableId].map(<span class="fstat-no" title="function not covered" >re</span>lated =&gt;
-<span class="cstat-no" title="statement not covered" >              exports.finaliseRow(appId, relatedTable, related, {</span>
+<span class="cstat-no" title="statement not covered" >              exports.finaliseRow(relatedTable, related, {</span>
                 updateFormula: false,
               })
             )
@@ -442,8 +440,8 @@ exports.updateRelatedFormula = async (appId, table, enrichedRows) =&gt; {
 <span class="cstat-no" title="statement not covered" >  await Promise.all(promises)</span>
 }
 &nbsp;
-exports.updateAllFormulasInTable = <span class="fstat-no" title="function not covered" >as</span>ync (appId, table) =&gt; {
-  const db = <span class="cstat-no" title="statement not covered" >new CouchDB(appId)</span>
+exports.updateAllFormulasInTable = <span class="fstat-no" title="function not covered" >as</span>ync table =&gt; {
+  const db = <span class="cstat-no" title="statement not covered" >getAppDB()</span>
   // start by getting the raw rows (which will be written back to DB after update)
   let rows = <span class="cstat-no" title="statement not covered" >(</span>
     await db.allDocs(
@@ -454,7 +452,7 @@ exports.updateAllFormulasInTable = <span class="fstat-no" title="function not co
   ).rows.map(<span class="fstat-no" title="function not covered" >ro</span>w =&gt; <span class="cstat-no" title="statement not covered" >row.doc)</span>
   // now enrich the rows, note the clone so that we have the base state of the
   // rows so that we don't write any of the enriched information back
-  let enrichedRows = <span class="cstat-no" title="statement not covered" >await outputProcessing({ appId }, table, cloneDeep(rows), {</span>
+  let enrichedRows = <span class="cstat-no" title="statement not covered" >await outputProcessing(table, cloneDeep(rows), {</span>
     squash: false,
   })
   const updatedRows = <span class="cstat-no" title="statement not covered" >[]</span>
@@ -482,15 +480,14 @@ exports.updateAllFormulasInTable = <span class="fstat-no" title="function not co
  * expects the row to be totally enriched/contain all relationships.
  */
 exports.finaliseRow = async (
-  appId,
   table,
   row,
   { oldTable, updateFormula } = <span class="branch-0 cbranch-no" title="branch not covered" >{ updateFormula: true }</span>
 ) =&gt; {
-  const db = new CouchDB(appId)
+  const db = getAppDB()
   row.type = "row"
   // process the row before return, to include relationships
-  let enrichedRow = await outputProcessing({ appId }, table, cloneDeep(row), {
+  let enrichedRow = await outputProcessing(table, cloneDeep(row), {
     squash: false,
   })
   // use enriched row to generate formulas for saving, specifically only use as context
@@ -524,7 +521,7 @@ exports.finaliseRow = async (
   enrichedRow = await processFormulas(table, enrichedRow, { dynamic: false })
   // this updates the related formulas in other rows based on the relations to this row
   if (updateFormula) {
-    await exports.updateRelatedFormula(appId, table, enrichedRow)
+    await exports.updateRelatedFormula(table, enrichedRow)
   }
   return { row: enrichedRow, table }
 }
@@ -535,7 +532,7 @@ exports.finaliseRow = async (
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Jan 31 2022 16:01:47 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:27:17 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>

package/coverage/lcov-report/api/controllers/row/utils.js.html

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">69.23% </span>
+                <span class="strong">69.81% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>36/52</span>
+                <span class='fraction'>37/53</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">68.62% </span>
+                <span class="strong">69.23% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>35/51</span>
+                <span class='fraction'>36/52</span>
             </div>
         
             
@@ -147,16 +147,17 @@
 <a name='L88'></a><a href='#L88'>88</a>
 <a name='L89'></a><a href='#L89'>89</a>
 <a name='L90'></a><a href='#L90'>90</a>
-<a name='L91'></a><a href='#L91'>91</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">37x</span>
+<a name='L91'></a><a href='#L91'>91</a>
+<a name='L92'></a><a href='#L92'>92</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -166,14 +167,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>
-<span class="cline-any cline-yes">37x</span>
+<span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">37x</span>
+<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">19x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">19x</span>
@@ -191,7 +193,7 @@
 <span class="cline-any cline-yes">16x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">37x</span>
+<span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-yes">77x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
@@ -239,12 +241,12 @@
 <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 validateJs = require("validate.js")
 const { cloneDeep } = require("lodash/fp")
-const CouchDB = require("../../../db")
 const { InternalTables } = require("../../../db/utils")
 const userController = require("../user")
 const { FieldTypes } = require("../../../constants")
 const { processStringSync } = require("@budibase/string-templates")
 const { makeExternalQuery } = require("../../../integrations/base/utils")
+const { getAppDB } = require("@budibase/backend-core/context")
 &nbsp;
 validateJs.extend(validateJs.validators.datetime, {
   parse: function (value) {
@@ -256,14 +258,15 @@ validateJs.extend(validateJs.validators.datetime, {
   },
 })
 &nbsp;
-exports.getDatasourceAndQuery = async (appId, json) =&gt; {
+exports.getDatasourceAndQuery = async json =&gt; {
   const datasourceId = json.endpoint.datasourceId
-  const db = new CouchDB(appId)
+  const db = getAppDB()
   const datasource = await db.get(datasourceId)
   return makeExternalQuery(datasource, json)
 }
 &nbsp;
-exports.findRow = async (ctx, db, tableId, rowId) =&gt; {
+exports.findRow = async (ctx, tableId, rowId) =&gt; {
+  const db = getAppDB()
   let row
   // TODO remove special user case in future
   <span class="missing-if-branch" title="if path not taken" >I</span>if (tableId === InternalTables.USER_METADATA) {
@@ -281,9 +284,9 @@ exports.findRow = async (ctx, db, tableId, rowId) =&gt; {
   return row
 }
 &nbsp;
-exports.validate = async ({ appId, tableId, row, table }) =&gt; {
+exports.validate = async ({ tableId, row, table }) =&gt; {
   if (!table) {
-    const db = new CouchDB(appId)
+    const db = getAppDB()
     table = await db.get(tableId)
   }
   const errors = {}
@@ -334,7 +337,7 @@ exports.validate = async ({ appId, tableId, row, table }) =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Jan 31 2022 16:01:47 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:27:17 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>

package/coverage/lcov-report/api/controllers/screen.js.html

@@ -25,7 +25,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>23/23</span>
+                <span class='fraction'>21/21</span>
             </div>
         
             
@@ -46,7 +46,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>23/23</span>
+                <span class='fraction'>21/21</span>
             </div>
         
             
@@ -103,14 +103,11 @@
 <a name='L44'></a><a href='#L44'>44</a>
 <a name='L45'></a><a href='#L45'>45</a>
 <a name='L46'></a><a href='#L46'>46</a>
-<a name='L47'></a><a href='#L47'>47</a>
-<a name='L48'></a><a href='#L48'>48</a>
-<a name='L49'></a><a href='#L49'>49</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">36x</span>
-<span class="cline-any cline-yes">36x</span>
-<span class="cline-any cline-yes">36x</span>
+<a name='L47'></a><a href='#L47'>47</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">36x</span>
-<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
@@ -127,8 +124,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>
-<span class="cline-any cline-yes">36x</span>
-<span class="cline-any cline-yes">19x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-yes">19x</span>
 <span class="cline-any cline-yes">19x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -145,7 +141,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>
-<span class="cline-any cline-yes">36x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -153,13 +149,12 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</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 CouchDB = require("../../db")
-const { getScreenParams, generateScreenID } = require("../../db/utils")
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const { getScreenParams, generateScreenID } = require("../../db/utils")
 const { AccessController } = require("@budibase/backend-core/roles")
+const { getAppDB } = require("@budibase/backend-core/context")
 &nbsp;
 exports.fetch = async ctx =&gt; {
-  const appId = ctx.appId
-  const db = new CouchDB(appId)
+  const db = getAppDB()
 &nbsp;
   const screens = (
     await db.allDocs(
@@ -169,15 +164,14 @@ exports.fetch = async ctx =&gt; {
     )
   ).rows.map(element =&gt; element.doc)
 &nbsp;
-  ctx.body = await new AccessController(appId).checkScreensAccess(
+  ctx.body = await new AccessController().checkScreensAccess(
     screens,
     ctx.user.role._id
   )
 }
 &nbsp;
 exports.save = async ctx =&gt; {
-  const appId = ctx.appId
-  const db = new CouchDB(appId)
+  const db = getAppDB()
   let screen = ctx.request.body
 &nbsp;
   if (!screen._id) {
@@ -194,7 +188,7 @@ exports.save = async ctx =&gt; {
 }
 &nbsp;
 exports.destroy = async ctx =&gt; {
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
   await db.remove(ctx.params.screenId, ctx.params.screenRev)
   ctx.body = {
     message: "Screen deleted successfully",
@@ -208,7 +202,7 @@ exports.destroy = async ctx =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Jan 31 2022 16:01:47 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:27:17 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/api/controllers/script.js.html

@@ -68,15 +68,15 @@
 <a name='L9'></a><a href='#L9'>9</a>
 <a name='L10'></a><a href='#L10'>10</a>
 <a name='L11'></a><a href='#L11'>11</a>
-<a name='L12'></a><a href='#L12'>12</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">37x</span>
+<a name='L12'></a><a href='#L12'>12</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">37x</span>
+<span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">37x</span>
+<span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-no">&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 ScriptRunner = require("../../utilities/scriptRunner")
@@ -97,7 +97,7 @@ exports.save = <span class="fstat-no" title="function not covered" >as</span>ync
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Jan 31 2022 16:01:47 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 10:27:17 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>