Merge pull request #10564 from nextcloud/backport/10558/stable26

[stable26] fix(RightSidebar) update active tab on mount and conversation change
nextcloud · Sep 25, 2023 · 120fc3a · 120fc3a
2 parents 1b067ae + e4a58c4
commit 120fc3a
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
@@ -317,6 +317,15 @@ export default {
 			}
 		},
 
+		isOneToOne: {
+			immediate: true,
+			handler(value) {
+				if (value) {
+					this.activeTab = 'shared-items'
+				}
+			},
+		},
+
 		isInCall(newValue) {
 			// Waiting for chat tab to mount / destroy
 			this.$nextTick(() => {

diff --git a/src/components/RightSidebar/SharedItems/SharedItemsTab.vue b/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
@@ -145,10 +145,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()
+				}
+			},
 		},
 	},