Merge pull request #10558 from nextcloud/backport/10557/master

fix(RightSidebar) update active tab on mount and conversation change
nextcloud · Sep 21, 2023 · d1ceece · d1ceece
2 parents 7ce9eb2 + b38e4dc
commit d1ceece
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
@@ -299,6 +299,15 @@ export default {
 			}
 		},
 
+		isOneToOne: {
+			immediate: true,
+			handler(value) {
+				if (value) {
+					this.activeTab = 'shared-items'
+				}
+			},
+		},
+
 		isInCall(newValue) {
 			if (newValue) {
 				// Set 'chat' tab as active, and switch to it if sidebar is open

diff --git a/src/components/RightSidebar/SharedItems/SharedItemsTab.vue b/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
@@ -167,10 +167,22 @@ export default {
 	},
 
 	watch: {
-		active(newValue) {
-			if (newValue) {
-				this.getSharedItemsOverview()
-			}
+		active: {
+			immediate: true,
+			handler(newValue) {
+				if (newValue && this.token) {
+					this.getSharedItemsOverview()
+				}
+			},
+		},
+
+		token: {
+			immediate: true,
+			handler(newValue) {
+				if (newValue && this.active) {
+					this.getSharedItemsOverview()
+				}
+			},
 		},
 	},