restore team dispatch when changing teams

FlowFuse · Dec 19, 2024 · 923aab4 · 923aab4
1 parent 5da7751
commit 923aab4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/frontend/src/components/TeamSelection.vue b/frontend/src/components/TeamSelection.vue
@@ -51,12 +51,14 @@ export default {
     methods: {
         selectTeam (team) {
             if (team) {
-                this.$router.push({
-                    name: 'Team',
-                    params: {
-                        team_slug: team.slug
-                    }
-                })
+                this.$store.dispatch('account/setTeam', team.slug)
+                    .then(() => this.$router.push({
+                        name: 'Team',
+                        params: {
+                            team_slug: team.slug
+                        }
+                    }))
+                    .catch(e => console.warn(e))
             }
         },
         createTeam () {

diff --git a/frontend/src/pages/account/Teams/Invitations.vue b/frontend/src/pages/account/Teams/Invitations.vue
@@ -53,12 +53,14 @@ export default {
             await this.$store.dispatch('account/refreshTeams')
             Alerts.emit(`Invite to "${invite.team.name}" has been accepted.`, 'confirmation')
             // navigate to team dashboad once invite accepted
-            this.$router.push({
-                name: 'Team',
-                params: {
-                    team_slug: invite.team.slug
-                }
-            })
+            this.$store.dispatch('account/setTeam', invite.team.slug)
+                .then(() => this.$router.push({
+                    name: 'Team',
+                    params: {
+                        team_slug: invite.team.slug
+                    }
+                }))
+                .catch(e => console.warn(e))
         },
         async rejectInvite (invite) {
             await userApi.rejectTeamInvitation(invite.id, invite.team.id)

diff --git a/frontend/src/pages/admin/Teams.vue b/frontend/src/pages/admin/Teams.vue
@@ -221,12 +221,14 @@ export default {
             this.loading = false
         },
         viewTeam (row) {
-            this.$router.push({
-                name: 'Team',
-                params: {
-                    team_slug: row.slug
-                }
-            })
+            this.$store.dispatch('account/setTeam', row.slug)
+                .then(() => this.$router.push({
+                    name: 'Team',
+                    params: {
+                        team_slug: row.slug
+                    }
+                }))
+                .catch(e => console.warn(e))
         }
     }
 }