Merge pull request nextcloud#6583 from nextcloud/bugfix/noid/always-o…

…pen-the-conversation-settings-with-the-right-data

Always open the conversation settings with the right data

src/components/ConversationSettings/ConversationSettingsDialog.vue

@@ -163,7 +163,8 @@ export default {
 		},
 
 		token() {
-			return this.$store.getters.getToken()
+			return this.$store.getters.getConversationSettingsToken()
+				|| this.$store.getters.getToken()
 		},
 
 		conversation() {
@@ -220,7 +221,8 @@ export default {
 	},
 
 	methods: {
-		handleShowSettings() {
+		handleShowSettings({ token }) {
+			this.$store.dispatch('updateConversationSettingsToken', token)
 			this.showSettings = true
 			this.$nextTick(() => {
 				this.$refs.linkShareSettings.focus()
@@ -229,6 +231,7 @@ export default {
 
 		handleHideSettings() {
 			this.showSettings = false
+			this.$store.dispatch('updateConversationSettingsToken', '')
 		},
 
 		beforeDestroy() {

src/components/LeftSidebar/ConversationsList/Conversation.vue

@@ -333,7 +333,7 @@ export default {
 		},
 
 		showConversationSettings() {
-			emit('show-conversation-settings')
+			emit('show-conversation-settings', { token: this.item.token })
 		},
 
 		/**

src/components/TopBar/TopBar.vue

@@ -131,7 +131,7 @@
 				<ActionButton
 					icon="icon-settings"
 					:close-after-click="true"
-					@click="showConversationSettings">
+					@click="openConversationSettings">
 					{{ t('spreed', 'Conversation settings') }}
 				</ActionButton>
 			</Actions>
@@ -408,10 +408,6 @@ export default {
 			BrowserStorage.setItem('sidebarOpen', 'true')
 		},
 
-		showConversationSettings() {
-			emit('show-conversation-settings')
-		},
-
 		fullScreenChanged() {
 			this.$store.dispatch(
 				'setIsFullscreen',
@@ -474,7 +470,7 @@ export default {
 		},
 
 		openConversationSettings() {
-			emit('show-conversation-settings')
+			emit('show-conversation-settings', { token: this.token })
 		},
 	},
 }

src/store/tokenStore.js

@@ -22,6 +22,7 @@
 
 const state = {
 	token: '',
+	conversationSettingsToken: '',
 	fileIdForToken: null,
 	/**
 	 * The joining of a room with the signaling server always lags
@@ -37,6 +38,9 @@ const getters = {
 	getToken: (state) => () => {
 		return state.token
 	},
+	getConversationSettingsToken: (state) => () => {
+		return state.conversationSettingsToken
+	},
 	getFileIdForToken: (state) => () => {
 		return state.fileIdForToken
 	},
@@ -56,6 +60,16 @@ const mutations = {
 		state.token = newToken
 	},
 
+	/**
+	 * Updates the token of the conversation settings dialog
+	 *
+	 * @param {object} state current store state;
+	 * @param {string} newToken The token of the active conversation
+	 */
+	updateConversationSettingsToken(state, newToken) {
+		state.conversationSettingsToken = newToken
+	},
+
 	/**
 	 * Updates the file ID for the current token
 	 *
@@ -86,6 +100,16 @@ const actions = {
 		context.commit('updateToken', newToken)
 	},
 
+	/**
+	 * Updates the token
+	 *
+	 * @param {object} context default store context;
+	 * @param {string} newToken The token of the active conversation
+	 */
+	updateConversationSettingsToken(context, newToken) {
+		context.commit('updateConversationSettingsToken', newToken)
+	},
+
 	/**
 	 * Updates the file ID for the current token
 	 *