Merge pull request #4103 from FlowFuse/fix-application-home-view

Fix race condition in loading application status
FlowFuse · Jul 4, 2024 · e86adb9 · e86adb9
2 parents c462ac1 + 52f2ed6
commit e86adb9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/frontend/src/pages/team/Applications/components/compact/InstanceTile.vue b/frontend/src/pages/team/Applications/components/compact/InstanceTile.vue
@@ -2,7 +2,7 @@
     <div class="instance-tile">
         <div class="status">
             <InstanceStatusBadge
-                :status="localInstance.meta.state"
+                :status="localInstance.meta?.state"
                 text=""
                 :pendingStateChange="localInstance.pendingStateChange"
                 :optimisticStateChange="localInstance.optimisticStateChange"

diff --git a/frontend/src/pages/team/Applications/index.vue b/frontend/src/pages/team/Applications/index.vue
@@ -142,9 +142,6 @@ export default {
 
                 const applicationsPromise = teamApi.getTeamApplications(this.team.id, { associationsLimit: ASSOCIATIONS_LIMIT })
 
-                // Not waited for as it can resolve in any order
-                this.updateApplicationAssociationStatuses()
-
                 const applications = (await applicationsPromise).applications
                 applications.forEach((applicationData) => {
                     const application = applicationsMap.get(applicationData.id) || {}
@@ -179,6 +176,8 @@ export default {
                     })
                 })
                 this.applications = applicationsMap
+                // Only update statuses *after* populating this.applications
+                this.updateApplicationAssociationStatuses()
             }
             this.loading = false
         },