@budibase/server 1.0.161 → 1.0.162

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

@@ -103,7 +103,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" rel="noopener noreferrer">istanbul</a>
-                at Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/controllers/table/bulkFormula.js.html

@@ -589,7 +589,7 @@ exports.runStaticFormulaChecks = async (table, { oldTable, deletion }) => {
             <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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/controllers/table/external.js.html

@@ -1024,7 +1024,7 @@ exports.bulkImport = <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" rel="noopener noreferrer">istanbul</a>
-                at Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/controllers/table/index.html

@@ -131,7 +131,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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/controllers/table/index.js.html

@@ -367,7 +367,7 @@ exports.validateCSVSchema = async function (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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

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

@@ -187,7 +187,7 @@ exports.downloadTemplate = async function (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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -772,7 +772,7 @@ exports.getFlags = <span class="fstat-no" title="function not covered" >as</span
             <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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/controllers/view/exporters.js.html

@@ -148,7 +148,7 @@ exports.ExportFormats = {
             <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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/controllers/view/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">73.84% </span>
+                <span class="strong">75.86% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>144/195</span>
+                <span class='fraction'>154/203</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">63.85% </span>
+                <span class="strong">66.29% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>53/83</span>
+                <span class='fraction'>59/89</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">72% </span>
+                <span class="strong">76.92% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>18/25</span>
+                <span class='fraction'>20/26</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">74.09% </span>
+                <span class="strong">76.11% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>143/193</span>
+                <span class='fraction'>153/201</span>
             </div>
         
             
@@ -110,32 +110,32 @@
 
 <tr>
 	<td class="file medium" data-value="utils.js"><a href="utils.js.html">utils.js</a></td>
-	<td data-value="53.08" class="pic medium">
+	<td data-value="53.65" class="pic medium">
 	<div class="chart"><div class="cover-fill" style="width: 53%"></div><div class="cover-empty" style="width: 47%"></div></div>
 	</td>
-	<td data-value="53.08" class="pct medium">53.08%</td>
-	<td data-value="81" class="abs medium">43/81</td>
+	<td data-value="53.65" class="pct medium">53.65%</td>
+	<td data-value="82" class="abs medium">44/82</td>
 	<td data-value="34.61" class="pct low">34.61%</td>
 	<td data-value="26" class="abs low">9/26</td>
 	<td data-value="66.66" class="pct medium">66.66%</td>
 	<td data-value="9" class="abs medium">6/9</td>
-	<td data-value="53.08" class="pct medium">53.08%</td>
-	<td data-value="81" class="abs medium">43/81</td>
+	<td data-value="53.65" class="pct medium">53.65%</td>
+	<td data-value="82" class="abs medium">44/82</td>
 	</tr>
 
 <tr>
 	<td class="file high" data-value="viewBuilder.js"><a href="viewBuilder.js.html">viewBuilder.js</a></td>
-	<td data-value="84.84" class="pic high">
-	<div class="chart"><div class="cover-fill" style="width: 84%"></div><div class="cover-empty" style="width: 16%"></div></div>
+	<td data-value="92.5" class="pic high">
+	<div class="chart"><div class="cover-fill" style="width: 92%"></div><div class="cover-empty" style="width: 8%"></div></div>
 	</td>
-	<td data-value="84.84" class="pct high">84.84%</td>
-	<td data-value="33" class="abs high">28/33</td>
-	<td data-value="83.33" class="pct high">83.33%</td>
-	<td data-value="30" class="abs high">25/30</td>
-	<td data-value="75" class="pct medium">75%</td>
-	<td data-value="4" class="abs medium">3/4</td>
-	<td data-value="84.84" class="pct high">84.84%</td>
-	<td data-value="33" class="abs high">28/33</td>
+	<td data-value="92.5" class="pct high">92.5%</td>
+	<td data-value="40" class="abs high">37/40</td>
+	<td data-value="86.11" class="pct high">86.11%</td>
+	<td data-value="36" class="abs high">31/36</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="5" class="abs high">5/5</td>
+	<td data-value="92.5" class="pct high">92.5%</td>
+	<td data-value="40" class="abs high">37/40</td>
 	</tr>
 
 </tbody>
@@ -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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/controllers/view/index.js.html

@@ -427,7 +427,7 @@ exports.exportView = async 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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

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

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">53.08% </span>
+                <span class="strong">53.65% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>43/81</span>
+                <span class='fraction'>44/82</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">53.08% </span>
+                <span class="strong">53.65% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>43/81</span>
+                <span class='fraction'>44/82</span>
             </div>
         
             
@@ -211,7 +211,9 @@
 <a name='L146'></a><a href='#L146'>146</a>
 <a name='L147'></a><a href='#L147'>147</a>
 <a name='L148'></a><a href='#L148'>148</a>
-<a name='L149'></a><a href='#L149'>149</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L149'></a><a href='#L149'>149</a>
+<a name='L150'></a><a href='#L150'>150</a>
+<a name='L151'></a><a href='#L151'>151</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>
@@ -220,6 +222,7 @@
 <span class="cline-any cline-yes">41x</span>
 <span class="cline-any cline-yes">41x</span>
 <span class="cline-any cline-yes">41x</span>
+<span class="cline-any cline-yes">41x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">41x</span>
 <span class="cline-any cline-yes">2x</span>
@@ -327,6 +330,7 @@
 <span class="cline-any cline-yes">41x</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>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -368,6 +372,7 @@
 } = require("../../../db/utils")
 const env = require("../../../environment")
 const { getAppDB } = require("@budibase/backend-core/context")
+const viewBuilder = require("./viewBuilder")
 &nbsp;
 exports.getView = async viewName =&gt; {
   const db = getAppDB()
@@ -475,7 +480,8 @@ exports.deleteView = async viewName =&gt; {
 exports.migrateToInMemoryView = <span class="fstat-no" title="function not covered" >as</span>ync (db, viewName) =&gt; {
   // delete the view initially
   const designDoc = <span class="cstat-no" title="statement not covered" >await db.get("_design/database")</span>
-  const view = <span class="cstat-no" title="statement not covered" >designDoc.views[viewName]</span>
+  // run the view back through the view builder to update it
+  const view = <span class="cstat-no" title="statement not covered" >viewBuilder(designDoc.views[viewName].meta)</span>
 <span class="cstat-no" title="statement not covered" >  delete designDoc.views[viewName]</span>
 <span class="cstat-no" title="statement not covered" >  await db.put(designDoc)</span>
 <span class="cstat-no" title="statement not covered" >  await exports.saveView(db, null, viewName, view)</span>
@@ -484,7 +490,7 @@ exports.migrateToInMemoryView = <span class="fstat-no" title="function not cover
 exports.migrateToDesignView = <span class="fstat-no" title="function not covered" >as</span>ync (db, viewName) =&gt; {
   let view = <span class="cstat-no" title="statement not covered" >await db.get(generateMemoryViewID(viewName))</span>
   const designDoc = <span class="cstat-no" title="statement not covered" >await db.get("_design/database")</span>
-<span class="cstat-no" title="statement not covered" >  designDoc.views[viewName] = view.view</span>
+<span class="cstat-no" title="statement not covered" >  designDoc.views[viewName] = viewBuilder(view.view.meta)</span>
 <span class="cstat-no" title="statement not covered" >  await db.put(designDoc)</span>
 <span class="cstat-no" title="statement not covered" >  await db.remove(view._id, view._rev)</span>
 }
@@ -514,7 +520,7 @@ exports.getFromMemoryDoc = async (db, viewName) =&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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/controllers/view/viewBuilder.js.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">84.84% </span>
+                <span class="strong">92.5% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>28/33</span>
+                <span class='fraction'>37/40</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">83.33% </span>
+                <span class="strong">86.11% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>25/30</span>
+                <span class='fraction'>31/36</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">75% </span>
+                <span class="strong">100% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>3/4</span>
+                <span class='fraction'>5/5</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">84.84% </span>
+                <span class="strong">92.5% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>28/33</span>
+                <span class='fraction'>37/40</span>
             </div>
         
             
@@ -225,7 +225,28 @@
 <a name='L160'></a><a href='#L160'>160</a>
 <a name='L161'></a><a href='#L161'>161</a>
 <a name='L162'></a><a href='#L162'>162</a>
-<a name='L163'></a><a href='#L163'>163</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">42x</span>
+<a name='L163'></a><a href='#L163'>163</a>
+<a name='L164'></a><a href='#L164'>164</a>
+<a name='L165'></a><a href='#L165'>165</a>
+<a name='L166'></a><a href='#L166'>166</a>
+<a name='L167'></a><a href='#L167'>167</a>
+<a name='L168'></a><a href='#L168'>168</a>
+<a name='L169'></a><a href='#L169'>169</a>
+<a name='L170'></a><a href='#L170'>170</a>
+<a name='L171'></a><a href='#L171'>171</a>
+<a name='L172'></a><a href='#L172'>172</a>
+<a name='L173'></a><a href='#L173'>173</a>
+<a name='L174'></a><a href='#L174'>174</a>
+<a name='L175'></a><a href='#L175'>175</a>
+<a name='L176'></a><a href='#L176'>176</a>
+<a name='L177'></a><a href='#L177'>177</a>
+<a name='L178'></a><a href='#L178'>178</a>
+<a name='L179'></a><a href='#L179'>179</a>
+<a name='L180'></a><a href='#L180'>180</a>
+<a name='L181'></a><a href='#L181'>181</a>
+<a name='L182'></a><a href='#L182'>182</a>
+<a name='L183'></a><a href='#L183'>183</a>
+<a name='L184'></a><a href='#L184'>184</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">42x</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>
@@ -238,7 +259,13 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">42x</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>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">7x</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>
@@ -296,34 +323,34 @@
 <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">11x</span>
+<span class="cline-any cline-yes">19x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
-<span class="cline-any cline-yes">11x</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">19x</span>
+<span class="cline-any cline-yes">19x</span>
+<span class="cline-any cline-yes">10x</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">2x</span>
+<span class="cline-any cline-yes">10x</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">2x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">7x</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">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">3x</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">10x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</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-neutral">&nbsp;</span>
@@ -333,7 +360,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">11x</span>
+<span class="cline-any cline-yes">12x</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>
@@ -349,26 +376,41 @@
 <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">11x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
-<span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-yes">7x</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">7x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<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>
+<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
-<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">12x</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>
@@ -399,8 +441,14 @@
   OR: "||",
 }
 &nbsp;
-const isEmptyExpression = <span class="fstat-no" title="function not covered" >ke</span>y =&gt; {
-<span class="cstat-no" title="statement not covered" >  return `(</span>
+const CONDITIONS = {
+  EMPTY: "EMPTY",
+  NOT_EMPTY: "NOT_EMPTY",
+  CONTAINS: "CONTAINS",
+}
+&nbsp;
+const isEmptyExpression = key =&gt; {
+  return `(
       doc["${key}"] === undefined ||
       doc["${key}"] === null ||
       doc["${key}"] === "" ||
@@ -466,17 +514,17 @@ function parseFilterExpression(filters) {
       expression.push(TOKEN_MAP[filter.conjunction])
     }
 &nbsp;
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (filter.condition === "CONTAINS") {
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (filter.condition === CONDITIONS.CONTAINS) {
 <span class="cstat-no" title="statement not covered" >      expression.push(</span>
         `doc["${filter.key}"].${TOKEN_MAP[filter.condition]}("${filter.value}")`
       )
-    } else <span class="missing-if-branch" title="if path not taken" >I</span>if (filter.condition === "EMPTY") {
+    } else <span class="missing-if-branch" title="if path not taken" >I</span>if (filter.condition === CONDITIONS.EMPTY) {
 <span class="cstat-no" title="statement not covered" >      expression.push(isEmptyExpression(filter.key))</span>
-    } else <span class="missing-if-branch" title="if path not taken" >I</span>if (filter.condition === "NOT_EMPTY") {
-<span class="cstat-no" title="statement not covered" >      expression.push(`!${isEmptyExpression(filter.key)}`)</span>
+    } else if (filter.condition === CONDITIONS.NOT_EMPTY) {
+      expression.push(`!${isEmptyExpression(filter.key)}`)
     } else {
       const value =
-        typeof filter.value == "string" ? `"${filter.value}"` : <span class="branch-1 cbranch-no" title="branch not covered" >filter.value</span>
+        typeof filter.value == "string" ? `"${filter.value}"` : filter.value
 &nbsp;
       expression.push(
         `doc["${filter.key}"] ${TOKEN_MAP[filter.condition]} ${value}`
@@ -514,21 +562,36 @@ function viewTemplate({ field, tableId, groupBy, filters = [], calculation }) {
   <span class="missing-if-branch" title="if path not taken" >I</span>if (filters &amp;&amp; filters.length &gt; 0 &amp;&amp; filters[0].conjunction) {
 <span class="cstat-no" title="statement not covered" >    delete filters[0].conjunction</span>
   }
-  const parsedFilters = parseFilterExpression(filters)
-  const filterExpression = parsedFilters ? `&amp;&amp; (${parsedFilters})` : ""
-&nbsp;
-  const emitExpression = parseEmitExpression(field, groupBy)
-&nbsp;
-  const reduction = field &amp;&amp; calculation ? { reduce: `_${calculation}` } : {}
 &nbsp;
-  let schema = null
+  let schema = null,
+    statFilter = null
 &nbsp;
   if (calculation) {
     schema = {
       ...(groupBy ? GROUP_PROPERTY : FIELD_PROPERTY),
       ...SCHEMA_MAP[calculation],
     }
+    <span class="missing-if-branch" title="else path not taken" >E</span>if (
+      !filters.find(
+        filter =&gt;
+          filter.key === field &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >filter.condition === CONDITIONS.NOT_EMPTY</span>
+      )
+    ) {
+      statFilter = parseFilterExpression([
+        { key: field, condition: CONDITIONS.NOT_EMPTY },
+      ])
+    }
   }
+&nbsp;
+  const parsedFilters = parseFilterExpression(filters)
+  const filterExpression = parsedFilters ? `&amp;&amp; (${parsedFilters})` : ""
+&nbsp;
+  const emitExpression = parseEmitExpression(field, groupBy)
+  const tableExpression = `doc.tableId === "${tableId}"`
+  const coreExpression = statFilter
+    ? `(${tableExpression} &amp;&amp; ${statFilter})`
+    : tableExpression
+  const reduction = field &amp;&amp; calculation ? { reduce: `_${calculation}` } : {}
 &nbsp;
   return {
     meta: {
@@ -540,7 +603,7 @@ function viewTemplate({ field, tableId, groupBy, filters = [], calculation }) {
       calculation,
     },
     map: `function (doc) {
-      if (doc.tableId === "${tableId}" ${filterExpression}) {
+      if (${coreExpression} ${filterExpression}) {
         ${emitExpression}
       }
     }`,
@@ -556,7 +619,7 @@ module.exports = viewTemplate
             <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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

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

@@ -409,7 +409,7 @@ exports.trigger = async 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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/index.html

@@ -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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/index.js.html

@@ -349,7 +349,7 @@ module.exports = router
             <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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/routes/analytics.js.html

@@ -100,7 +100,7 @@ module.exports = router
             <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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/routes/apikeys.js.html

@@ -106,7 +106,7 @@ module.exports = router
             <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 Fri May 13 2022 15:44:56 GMT+0000 (Coordinated Universal Time)
+                at Mon May 16 2022 16:48:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>