@budibase/server 0.9.184 → 0.9.185-alpha.11

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

@@ -30,7 +30,7 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">30.77% </span>
+                <span class="strong">30.76% </span>
                 <span class="quiet">Branches</span>
                 <span class='fraction'>4/13</span>
             </div>
@@ -181,7 +181,7 @@ exports.endUserPing = <span class="fstat-no" title="function not covered" >as</s
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Nov 11 2021 11:32:22 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 10:23:31 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -205,7 +205,7 @@ exports.update = async function (ctx) {
  
   try {
     const mainDoc = await getBuilderMainDoc()
-    <span class="missing-if-branch" title="else path not taken" >E</span>if (mainDoc.apiKeys == null) {
+    if (mainDoc.apiKeys == null) {
       mainDoc.apiKeys = {}
     }
     mainDoc.apiKeys[key] = value
@@ -226,7 +226,7 @@ exports.update = async function (ctx) {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Nov 11 2021 11:32:22 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 10:23:31 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.41% </span>
+                <span class="strong">78.49% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>138/176</span>
+                <span class='fraction'>146/186</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">57.35% </span>
+                <span class="strong">56.94% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>39/68</span>
+                <span class='fraction'>41/72</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">79.31% </span>
+                <span class="strong">79.34% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>138/174</span>
+                <span class='fraction'>146/184</span>
             </div>
         
             
@@ -457,7 +457,24 @@
 <a name='L398'></a><a href='#L398'>398</a>
 <a name='L399'></a><a href='#L399'>399</a>
 <a name='L400'></a><a href='#L400'>400</a>
-<a name='L401'></a><a href='#L401'>401</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">33x</span>
+<a name='L401'></a><a href='#L401'>401</a>
+<a name='L402'></a><a href='#L402'>402</a>
+<a name='L403'></a><a href='#L403'>403</a>
+<a name='L404'></a><a href='#L404'>404</a>
+<a name='L405'></a><a href='#L405'>405</a>
+<a name='L406'></a><a href='#L406'>406</a>
+<a name='L407'></a><a href='#L407'>407</a>
+<a name='L408'></a><a href='#L408'>408</a>
+<a name='L409'></a><a href='#L409'>409</a>
+<a name='L410'></a><a href='#L410'>410</a>
+<a name='L411'></a><a href='#L411'>411</a>
+<a name='L412'></a><a href='#L412'>412</a>
+<a name='L413'></a><a href='#L413'>413</a>
+<a name='L414'></a><a href='#L414'>414</a>
+<a name='L415'></a><a href='#L415'>415</a>
+<a name='L416'></a><a href='#L416'>416</a>
+<a name='L417'></a><a href='#L417'>417</a>
+<a name='L418'></a><a href='#L418'>418</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -503,6 +520,9 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -714,6 +734,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">178x</span>
 <span class="cline-any cline-yes">178x</span>
+<span class="cline-any cline-yes">178x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">33x</span>
@@ -775,7 +796,11 @@
 <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-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">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>
@@ -787,6 +812,8 @@
 <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>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -816,6 +843,10 @@
 <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-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>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -841,6 +872,9 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-yes">178x</span>
@@ -903,6 +937,9 @@ const {
   revertClientLibrary,
 } = require("../../utilities/fileSystem/clientLibrary")
 const { getTenantId, isMultiTenant } = require("@budibase/auth/tenancy")
+const { syncGlobalUsers } = require("./user")
+const { app: appCache } = require("@budibase/auth/cache")
+const { cleanupAutomations } = require("../../automations/utils")
 &nbsp;
 const URL_REGEX_SLASH = /\/|\\/g
 &nbsp;
@@ -1004,10 +1041,10 @@ exports.fetch = async ctx =&gt; {
   const apps = await getAllApps(CouchDB, { dev, all })
 &nbsp;
   // get the locks for all the dev apps
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (dev || <span class="branch-1 cbranch-no" title="branch not covered" >all)</span> {
+  if (dev || <span class="branch-1 cbranch-no" title="branch not covered" >all)</span> {
     const locks = await getAllLocks()
     for (let app of apps) {
-      <span class="missing-if-branch" title="else path not taken" >E</span>if (app.status !== "development") {
+      if (app.status !== "development") {
         continue
       }
       const lock = <span class="cstat-no" title="statement not covered" >locks.find(<span class="fstat-no" title="function not covered" >lo</span>ck =&gt; <span class="cstat-no" title="statement not covered" >lock.appId === app.appId)</span></span>
@@ -1056,7 +1093,7 @@ exports.fetchAppPackage = async ctx =&gt; {
     application,
     screens,
     layouts,
-    clientLibPath: clientLibraryPath(ctx.params.appId),
+    clientLibPath: clientLibraryPath(ctx.params.appId, application.version),
   }
 }
 &nbsp;
@@ -1103,7 +1140,7 @@ exports.create = async ctx =&gt; {
 &nbsp;
   // Only create the default home screens and layout if we aren't importing
   // an app
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (useTemplate !== "true") {
+  if (useTemplate !== "true") {
     await createEmptyAppPackage(ctx, newApplication)
   }
 &nbsp;
@@ -1112,6 +1149,7 @@ exports.create = async ctx =&gt; {
     await createApp(appId)
   }
 &nbsp;
+  await appCache.invalidateAppMetadata(appId, newApplication)
   ctx.status = 200
   ctx.body = newApplication
 }
@@ -1175,8 +1213,12 @@ exports.delete = async ctx =&gt; {
   if (!env.isTest() &amp;&amp; !ctx.query.unpublish) {
     await deleteApp(ctx.params.appId)
   }
+  <span class="missing-if-branch" title="if path not taken" >I</span>if (ctx.query &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >ctx.query.unpublish)</span> {
+<span class="cstat-no" title="statement not covered" >    await cleanupAutomations(ctx.params.appId)</span>
+  }
   // make sure the app/role doesn't stick around after the app has been deleted
   await removeAppFromUserRoles(ctx, ctx.params.appId)
+  await appCache.invalidateAppMetadata(ctx.params.appId)
 &nbsp;
   ctx.status = 200
   ctx.body = result
@@ -1187,6 +1229,8 @@ exports.sync = <span class="fstat-no" title="function not covered" >as</span>ync
 <span class="cstat-no" title="statement not covered" >  if (!isDevAppID(appId)) {</span>
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, "This action cannot be performed for production apps")</span>
   }
+&nbsp;
+  // replicate prod to dev
   const prodAppId = <span class="cstat-no" title="statement not covered" >getDeployedAppID(appId)</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  try {</span>
@@ -1216,6 +1260,10 @@ exports.sync = <span class="fstat-no" title="function not covered" >as</span>ync
   } catch (err) {
 <span class="cstat-no" title="statement not covered" >    error = err</span>
   }
+&nbsp;
+  // sync the users
+<span class="cstat-no" title="statement not covered" >  await syncGlobalUsers(appId)</span>
+&nbsp;
 <span class="cstat-no" title="statement not covered" >  if (error) {</span>
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, error)</span>
   } else {
@@ -1231,7 +1279,7 @@ const updateAppPackage = async (ctx, appPackage, appId) =&gt; {
   const application = await db.get(DocumentTypes.APP_METADATA)
 &nbsp;
   const newAppPackage = { ...application, ...appPackage, url }
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (appPackage._rev !== application._rev) {
+  if (appPackage._rev !== application._rev) {
     newAppPackage._rev = application._rev
   }
 &nbsp;
@@ -1239,7 +1287,10 @@ const updateAppPackage = async (ctx, appPackage, appId) =&gt; {
   // Redis, shouldn't ever store it
   delete newAppPackage.lockedBy
 &nbsp;
-  return await db.put(newAppPackage)
+  const response = await db.put(newAppPackage)
+  // remove any cached metadata, so that it will be updated
+  await appCache.invalidateAppMetadata(appId)
+  return response
 }
 &nbsp;
 const createEmptyAppPackage = async (ctx, app) =&gt; {
@@ -1264,7 +1315,7 @@ const createEmptyAppPackage = async (ctx, app) =&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 Thu Nov 11 2021 11:32:22 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 10:23:31 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">84.62% </span>
+                <span class="strong">85.18% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>22/26</span>
+                <span class='fraction'>23/27</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">84.62% </span>
+                <span class="strong">85.18% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>22/26</span>
+                <span class='fraction'>23/27</span>
             </div>
         
             
@@ -109,7 +109,10 @@
 <a name='L50'></a><a href='#L50'>50</a>
 <a name='L51'></a><a href='#L51'>51</a>
 <a name='L52'></a><a href='#L52'>52</a>
-<a name='L53'></a><a href='#L53'>53</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">23x</span>
+<a name='L53'></a><a href='#L53'>53</a>
+<a name='L54'></a><a href='#L54'>54</a>
+<a name='L55'></a><a href='#L55'>55</a>
+<a name='L56'></a><a href='#L56'>56</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-yes">23x</span>
@@ -127,6 +130,8 @@
 <span class="cline-any cline-yes">1x</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-yes">1x</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>
@@ -149,6 +154,7 @@
 <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-neutral">&nbsp;</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>
@@ -177,8 +183,10 @@ exports.fetchSelf = async ctx =&gt; {
   }
 &nbsp;
   const user = await getFullUser(ctx, userId)
+  // this shouldn't be returned by the app self
+  delete user.roles
 &nbsp;
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (appId) {
+  if (appId) {
     const db = new CouchDB(appId)
     // remove the full roles structure
     delete user.roles
@@ -197,19 +205,20 @@ exports.fetchSelf = async ctx =&gt; {
 <span class="cstat-no" title="statement not covered" >        response = {}</span>
       }
       // user has a role of some sort, return them
-      else <span class="missing-if-branch" title="else path not taken" >E</span>if (err.status === 404) {
+      else if (err.status === 404) {
         const metadata = {
+          ...user,
           _id: userId,
         }
         const dbResp = await db.put(metadata)
         user._rev = dbResp.rev
         response = user
-      } else {
+      } else <span class="missing-if-branch" title="else path not taken" >E</span>{
 <span class="cstat-no" title="statement not covered" >        response = user</span>
       }
       ctx.body = response
     }
-  } else {
+  } else <span class="missing-if-branch" title="else path not taken" >E</span>{
 <span class="cstat-no" title="statement not covered" >    ctx.body = user</span>
   }
 }
@@ -220,7 +229,7 @@ exports.fetchSelf = 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 Thu Nov 11 2021 11:32:22 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 10:23:31 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -30,14 +30,14 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">71.88% </span>
+                <span class="strong">71.87% </span>
                 <span class="quiet">Branches</span>
                 <span class='fraction'>23/32</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">92.86% </span>
+                <span class="strong">92.85% </span>
                 <span class="quiet">Functions</span>
                 <span class='fraction'>13/14</span>
             </div>
@@ -736,7 +736,7 @@ exports.test = async function (ctx) {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Nov 11 2021 11:32:22 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 10:23:31 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -91,7 +91,7 @@ exports.exportAppDump = async function (ctx) {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Nov 11 2021 11:32:22 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 10:23:31 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -397,7 +397,7 @@ exports.importApps = <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 Thu Nov 11 2021 11:32:22 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 10:23:31 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -114,11 +114,11 @@
 <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">43x</span>
+<span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">42x</span>
-<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">45x</span>
+<span class="cline-any cline-yes">45x</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>
@@ -169,7 +169,7 @@ exports.fetchAppComponentDefinitions = async function (ctx) {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Nov 11 2021 11:32:22 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 10:23:31 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>