Merge branch 'develop' into BUDI-7189/type_search

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.8.29-alpha.16",
+  "version": "2.8.29-alpha.17",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/builder/src/pages/builder/apps/index.svelte

@@ -28,25 +28,13 @@
   let userInfoModal
   let changePasswordModal
 
-  onMount(async () => {
-    try {
-      await organisation.init()
-      await apps.load()
-      await groups.actions.init()
-    } catch (error) {
-      notifications.error("Error loading apps")
-    }
-    loaded = true
-  })
-  const publishedAppsOnly = app => app.status === AppStatus.DEPLOYED
-
   $: userGroups = $groups.filter(group =>
     group.users.find(user => user._id === $auth.user?._id)
   )
-  $: publishedApps = $apps.filter(publishedAppsOnly)
+  $: publishedApps = $apps.filter(app => app.status === AppStatus.DEPLOYED)
-  $: userApps = getUserApps($auth.user)
+  $: userApps = getUserApps(publishedApps, userGroups, $auth.user)
 
-  function getUserApps(user) {
+  function getUserApps(publishedApps, userGroups, user) {
     if (sdk.users.isAdmin(user)) {
       return publishedApps
     }
@@ -84,6 +72,17 @@
       // Swallow error and do nothing
     }
   }
+
+  onMount(async () => {
+    try {
+      await organisation.init()
+      await apps.load()
+      await groups.actions.init()
+    } catch (error) {
+      notifications.error("Error loading apps")
+    }
+    loaded = true
+  })
 </script>
 
 {#if $auth.user && loaded}