@budibase/server 2.2.12-alpha.5 → 2.2.12-alpha.51

package/coverage/lcov-report/src/api/controllers/row/ExternalRequest.ts.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">3.74% </span>
+                <span class="strong">2.73% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>11/294</span>
+                <span class='fraction'>8/293</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/211</span>
+                <span class='fraction'>0/186</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>0/32</span>
+                <span class='fraction'>0/33</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">3.78% </span>
+                <span class="strong">2.74% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>11/291</span>
+                <span class='fraction'>8/291</span>
             </div>
         
             
@@ -797,7 +797,13 @@
 <a name='L732'></a><a href='#L732'>732</a>
 <a name='L733'></a><a href='#L733'>733</a>
 <a name='L734'></a><a href='#L734'>734</a>
-<a name='L735'></a><a href='#L735'>735</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">55x</span>
+<a name='L735'></a><a href='#L735'>735</a>
+<a name='L736'></a><a href='#L736'>736</a>
+<a name='L737'></a><a href='#L737'>737</a>
+<a name='L738'></a><a href='#L738'>738</a>
+<a name='L739'></a><a href='#L739'>739</a>
+<a name='L740'></a><a href='#L740'>740</a>
+<a name='L741'></a><a href='#L741'>741</a></td><td class="line-coverage quiet"><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>
@@ -809,21 +815,22 @@
 <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">56x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">55x</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">56x</span>
+<span class="cline-any cline-yes">56x</span>
+<span class="cline-any cline-yes">56x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">55x</span>
-<span class="cline-any cline-yes">55x</span>
-<span class="cline-any cline-yes">55x</span>
-<span class="cline-any cline-yes">55x</span>
-<span class="cline-any cline-yes">55x</span>
-<span class="cline-any cline-yes">55x</span>
-<span class="cline-any cline-yes">55x</span>
-<span class="cline-any cline-yes">55x</span>
+<span class="cline-any cline-yes">56x</span>
+<span class="cline-any cline-yes">56x</span>
+<span class="cline-any cline-yes">56x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">56x</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>
@@ -1010,7 +1017,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">55x</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>
@@ -1466,7 +1473,6 @@
 <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-no">&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>
@@ -1480,6 +1486,12 @@
 <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-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-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1558,6 +1570,7 @@ import { cloneDeep } from "lodash/fp"
 import { processFormulas, processDates } from "../../../utilities/rowProcessor"
 import { context } from "@budibase/backend-core"
 import { removeKeyNumbering } from "./utils"
+import sdk from "../../../sdk"
 &nbsp;
 export interface ManyRelationship {
   tableId?: string
@@ -1633,7 +1646,7 @@ function <span class="fstat-no" title="function not covered" >buildFilters(</spa
  * simplify it down to the requirements. This function is quite complex as we try to be
  * relatively restrictive over what types of columns we will perform this action for.
  */
-function <span class="fstat-no" title="function not covered" >cleanupConfig(</span>config: RunConfig, table: Table): RunConfig {
+function <span class="fstat-no" title="function not covered" >cleanupConfig(c</span>onfig: RunConfig, table: Table): RunConfig {
   const primaryOptions = <span class="cstat-no" title="statement not covered" >[</span>
     FieldTypes.STRING,
     FieldTypes.LONGFORM,
@@ -1642,11 +1655,11 @@ function <span class="fstat-no" title="function not covered" >cleanupConfig(</sp
   ]
   // filter out fields which cannot be keys
   const fieldNames = <span class="cstat-no" title="statement not covered" >Object.entries(table.schema)</span>
-    .filter(<span class="fstat-no" title="function not covered" >schema </span>=&gt; <span class="cstat-no" title="statement not covered" >primaryOptions.find(<span class="fstat-no" title="function not covered" >val </span>=&gt; <span class="cstat-no" title="statement not covered" >val === schema[1].type)</span>)</span>
+    .filter(<span class="fstat-no" title="function not covered" >schema =&gt; <span class="cstat-no" title="statement not covered" >p</span>rimaryOptions.find(<span class="fstat-no" title="function not covered" >val =&gt; <span class="cstat-no" title="statement not covered" >v</span>al === schema[1].type)</span>)</span>
     .map(<span class="fstat-no" title="function not covered" >([</span>fieldName]) =&gt; <span class="cstat-no" title="statement not covered" >fieldName)</span>
   const iterateObject = <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >(o</span>bj: { [key: string]: any }) =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >    for (let [field, value] of Object.entries(obj)) {</span>
-<span class="cstat-no" title="statement not covered" >      <span class="missing-if-branch" title="if path not taken" >I</span>if (fieldNames.find(<span class="fstat-no" title="function not covered" >name </span>=&gt; <span class="cstat-no" title="statement not covered" >name === field)</span> &amp;&amp; isRowId(value)) {</span>
+<span class="cstat-no" title="statement not covered" >      <span class="missing-if-branch" title="if path not taken" >I</span>if (fieldNames.find(<span class="fstat-no" title="function not covered" >name =&gt; <span class="cstat-no" title="statement not covered" >n</span>ame === field) &amp;&amp; i</span>sRowId(value)) {</span>
 <span class="cstat-no" title="statement not covered" >        obj[field] = convertRowId(value)</span>
       }
     }
@@ -1672,7 +1685,7 @@ function <span class="fstat-no" title="function not covered" >cleanupConfig(</sp
 <span class="cstat-no" title="statement not covered" >  return config</span>
 }
 &nbsp;
-function <span class="fstat-no" title="function not covered" >generateIdForRow(</span>row: Row | undefined, table: Table): string {
+function <span class="fstat-no" title="function not covered" >generateIdForRow(r</span>ow: Row | undefined, table: Table): string {
   const primary = <span class="cstat-no" title="statement not covered" >table.primary</span>
 <span class="cstat-no" title="statement not covered" >  <span class="missing-if-branch" title="if path not taken" >I</span>if (!row || !primary) {</span>
 <span class="cstat-no" title="statement not covered" >    return ""</span>
@@ -1692,7 +1705,7 @@ function <span class="fstat-no" title="function not covered" >generateIdForRow(<
 <span class="cstat-no" title="statement not covered" >  return generateRowIdField(idParts)</span>
 }
 &nbsp;
-function <span class="fstat-no" title="function not covered" >getEndpoint(</span>tableId: string | undefined, operation: string) {
+function <span class="fstat-no" title="function not covered" >getEndpoint(t</span>ableId: string | undefined, operation: string) {
 <span class="cstat-no" title="statement not covered" >  <span class="missing-if-branch" title="if path not taken" >I</span>if (!tableId) {</span>
 <span class="cstat-no" title="statement not covered" >    return {}</span>
   }
@@ -1704,7 +1717,7 @@ function <span class="fstat-no" title="function not covered" >getEndpoint(</span
   }
 }
 &nbsp;
-function <span class="fstat-no" title="function not covered" >basicProcessing(</span>row: Row, table: Table): Row {
+function <span class="fstat-no" title="function not covered" >basicProcessing(r</span>ow: Row, table: Table): Row {
   const thisRow: Row = <span class="cstat-no" title="statement not covered" >{}</span>
   // filter the row down to what is actually the row (not joined)
 <span class="cstat-no" title="statement not covered" >  for (let fieldName of Object.keys(table.schema)) {</span>
@@ -1721,7 +1734,7 @@ function <span class="fstat-no" title="function not covered" >basicProcessing(</
 <span class="cstat-no" title="statement not covered" >  return processFormulas(table, thisRow)</span>
 }
 &nbsp;
-function <span class="fstat-no" title="function not covered" >fixArrayTypes(</span>row: Row, table: Table) {
+function <span class="fstat-no" title="function not covered" >fixArrayTypes(r</span>ow: Row, table: Table) {
 <span class="cstat-no" title="statement not covered" >  for (let [fieldName, schema] of Object.entries(table.schema)) {</span>
 <span class="cstat-no" title="statement not covered" >    <span class="missing-if-branch" title="if path not taken" >I</span>if (</span>
       schema.type === FieldTypes.ARRAY &amp;&amp;
@@ -1738,13 +1751,13 @@ function <span class="fstat-no" title="function not covered" >fixArrayTypes(</sp
 <span class="cstat-no" title="statement not covered" >  return row</span>
 }
 &nbsp;
-function <span class="fstat-no" title="function not covered" >isOneSide(</span>field: FieldSchema) {
+function <span class="fstat-no" title="function not covered" >isOneSide(f</span>ield: FieldSchema) {
 <span class="cstat-no" title="statement not covered" >  return (</span>
     field.relationshipType &amp;&amp; field.relationshipType.split("-")[0] === "one"
   )
 }
 &nbsp;
-export class ExternalRequest {
+export class <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >ExternalRequest {</span></span>
   private operation: Operation
   private tableId: string
   private datasource?: Datasource
@@ -1759,7 +1772,7 @@ export class ExternalRequest {
     }
   }
 &nbsp;
-<span class="fstat-no" title="function not covered" >  getTable(</span>tableId: string | undefined): Table | undefined {
+<span class="fstat-no" title="function not covered" >  getTable(t</span>ableId: string | undefined): Table | undefined {
 <span class="cstat-no" title="statement not covered" >    <span class="missing-if-branch" title="if path not taken" >I</span>if (!tableId) {</span>
 <span class="cstat-no" title="statement not covered" >      throw "Table ID is unknown, cannot find table"</span>
     }
@@ -1769,7 +1782,7 @@ export class ExternalRequest {
     }
   }
 &nbsp;
-<span class="fstat-no" title="function not covered" >  inputProcessing(</span>row: Row | undefined, table: Table) {
+<span class="fstat-no" title="function not covered" >  inputProcessing(r</span>ow: Row | undefined, table: Table) {
 <span class="cstat-no" title="statement not covered" >    <span class="missing-if-branch" title="if path not taken" >I</span>if (!row) {</span>
 <span class="cstat-no" title="statement not covered" >      return { row, manyRelationships: [] }</span>
     }
@@ -1986,7 +1999,7 @@ export class ExternalRequest {
    * this will be used by the underlying library to build whatever relationship mechanism
    * it has (e.g. SQL joins).
    */
-<span class="fstat-no" title="function not covered" >  buildRelationships(</span>table: Table): RelationshipsJson[] {
+<span class="fstat-no" title="function not covered" >  buildRelationships(t</span>able: Table): RelationshipsJson[] {
     const relationships = <span class="cstat-no" title="statement not covered" >[]</span>
 <span class="cstat-no" title="statement not covered" >    for (let [fieldName, field] of Object.entries(table.schema)) {</span>
 <span class="cstat-no" title="statement not covered" >      <span class="missing-if-branch" title="if path not taken" >I</span>if (field.type !== FieldTypes.LINK) {</span>
@@ -2029,7 +2042,7 @@ export class ExternalRequest {
    * This is a cached lookup, of relationship records, this is mainly for creating/deleting junction
    * information.
    */
-  async <span class="fstat-no" title="function not covered" >lookupRelations(</span>tableId: string, row: Row) {
+<span class="fstat-no" title="function not covered" >  async l</span>ookupRelations(tableId: string, row: Row) {
     const related: { [key: string]: any } = <span class="cstat-no" title="statement not covered" >{}</span>
     const { tableName } = <span class="cstat-no" title="statement not covered" >breakExternalTableId(tableId)</span>
 <span class="cstat-no" title="statement not covered" >    <span class="missing-if-branch" title="if path not taken" >I</span>if (!tableName) {</span>
@@ -2085,7 +2098,7 @@ export class ExternalRequest {
    * isn't supposed to exist anymore and delete those. This is better than the usual method of delete them
    * all and then re-create, as theres no chance of losing data (e.g. delete succeed, but write fail).
    */
-  async <span class="fstat-no" title="function not covered" >handleManyRelationships(</span>
+<span class="fstat-no" title="function not covered" >  async h</span>andleManyRelationships(
     mainTableId: string,
     row: Row,
     relationships: ManyRelationship[]
@@ -2094,7 +2107,7 @@ export class ExternalRequest {
     const promises = <span class="cstat-no" title="statement not covered" >[]</span>
     const related = <span class="cstat-no" title="statement not covered" >await this.lookupRelations(mainTableId, row)</span>
 <span class="cstat-no" title="statement not covered" >    for (let relationship of relationships) {</span>
-      const { key, tableId, isUpdate, id, ...rest<span class="cstat-no" title="statement not covered" > } = <span class="cstat-no" title="statement not covered" >r</span>elationship</span>
+      const { key, tableId, isUpdate, id, ...rest } = <span class="cstat-no" title="statement not covered" >relationship</span>
       const body: { [key: string]: any } = <span class="cstat-no" title="statement not covered" >processObjectSync(rest, row, {})</span>
       const linkTable = <span class="cstat-no" title="statement not covered" >this.getTable(tableId)</span>
       // @ts-ignore
@@ -2163,15 +2176,15 @@ export class ExternalRequest {
     table: Table,
     includeRelations: IncludeRelationship = <span class="branch-0 cbranch-no" title="branch not covered" >IncludeRelationship.INCLUDE</span>
   ) {
-    function <span class="fstat-no" title="function not covered" >extractRealFields(</span>table: Table, existing: string[] = <span class="branch-0 cbranch-no" title="branch not covered" >[])</span> {
+    function <span class="fstat-no" title="function not covered" >extractRealFields(t</span>able: Table, existing: string[] = <span class="branch-0 cbranch-no" title="branch not covered" >[])</span> {
 <span class="cstat-no" title="statement not covered" >      return Object.entries(table.schema)</span>
         .filter(
-<span class="fstat-no" title="function not covered" >          column </span>=&gt;
+<span class="fstat-no" title="function not covered" >          column =&gt;</span>
 <span class="cstat-no" title="statement not covered" >            column[1].type !== FieldTypes.LINK &amp;&amp;</span>
             column[1].type !== FieldTypes.FORMULA &amp;&amp;
             !existing.find(<span class="fstat-no" title="function not covered" >(f</span>ield: string) =&gt; <span class="cstat-no" title="statement not covered" >field === column[0])</span>
         )
-        .map(<span class="fstat-no" title="function not covered" >column </span>=&gt; <span class="cstat-no" title="statement not covered" >`${table.name}.${column[0]}`)</span>
+        .map(<span class="fstat-no" title="function not covered" >column =&gt; <span class="cstat-no" title="statement not covered" >`</span>${table.name}.${column[0]}`)</span>
     }
     let fields = <span class="cstat-no" title="statement not covered" >extractRealFields(table)</span>
 <span class="cstat-no" title="statement not covered" >    for (let field of Object.values(table.schema)) {</span>
@@ -2190,15 +2203,14 @@ export class ExternalRequest {
 <span class="cstat-no" title="statement not covered" >    return fields</span>
   }
 &nbsp;
-  async <span class="fstat-no" title="function not covered" >run(</span>config: RunConfig) {
+<span class="fstat-no" title="function not covered" >  async r</span>un(config: RunConfig) {
     const { operation, tableId } = <span class="cstat-no" title="statement not covered" >this</span>
     let { datasourceId, tableName } = <span class="cstat-no" title="statement not covered" >breakExternalTableId(tableId)</span>
 <span class="cstat-no" title="statement not covered" >    <span class="missing-if-branch" title="if path not taken" >I</span>if (!tableName) {</span>
 <span class="cstat-no" title="statement not covered" >      throw "Unable to run without a table name"</span>
     }
 <span class="cstat-no" title="statement not covered" >    <span class="missing-if-branch" title="if path not taken" >I</span>if (!this.datasource) {</span>
-      const db = <span class="cstat-no" title="statement not covered" >context.getAppDB()</span>
-<span class="cstat-no" title="statement not covered" >      this.datasource = await db.get(datasourceId)</span>
+<span class="cstat-no" title="statement not covered" >      this.datasource = await sdk.datasources.get(datasourceId!)</span>
 <span class="cstat-no" title="statement not covered" >      <span class="missing-if-branch" title="if path not taken" >I</span>if (!this.datasource || !this.datasource.entities) {</span>
 <span class="cstat-no" title="statement not covered" >        throw "No tables found, fetch tables before query."</span>
       }
@@ -2214,6 +2226,12 @@ export class ExternalRequest {
       config,
       table
     )
+    //if the sort column is a formula, remove it
+<span class="cstat-no" title="statement not covered" >    for (let sortColumn of Object.keys(sort || {})) {</span>
+<span class="cstat-no" title="statement not covered" >      <span class="missing-if-branch" title="if path not taken" >I</span>if (table.schema[sortColumn]?.type === "formula") {</span>
+<span class="cstat-no" title="statement not covered" >        delete sort?.[sortColumn]</span>
+      }
+    }
 <span class="cstat-no" title="statement not covered" >    filters = buildFilters(id, filters || {}, table)</span>
     const relationships = <span class="cstat-no" title="statement not covered" >this.buildRelationships(table)</span>
     // clean up row on ingress using schema
@@ -2272,7 +2290,7 @@ export class ExternalRequest {
             <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 Tue Jan 10 2023 17:21:59 GMT+0000 (Coordinated Universal Time)
+                at Tue Jan 31 2023 16:53:54 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../../prettify.js"></script>
         <script>