From 4c26abc83d105db89e087abafd6286ad84d63d3f Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 4 Aug 2023 08:41:04 +0100
Subject: [PATCH 1/2] Fix reactivity bug with normal user app list

---
 .../src/pages/builder/apps/index.svelte       | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte
index 6b74694c00..ca3617b589 100644
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/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)
-  $: userApps = getUserApps($auth.user)
+  $: publishedApps = $apps.filter(app => app.status === AppStatus.DEPLOYED)
+  $: 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}

From 13ae01bcf44350feeda60734d9a93281ee752ad7 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 4 Aug 2023 08:26:03 +0000
Subject: [PATCH 2/2] Bump version to 2.8.29-alpha.17

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index a8a8ad485c..f33b6d0a7d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.8.29-alpha.16",
+  "version": "2.8.29-alpha.17",
   "npmClient": "yarn",
   "packages": [
     "packages/*"