fixup! Refactor(Mixin): Migrate getParticipants mixin to composable

nextcloud · Jan 5, 2024 · ebb2985 · ebb2985
1 parent b264f24
commit ebb2985
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue
@@ -132,7 +132,6 @@ export default {
 			participantsInitialised,
 			cancelableGetParticipants,
 			initialiseGetParticipants,
-			stopGetParticipants,
 		} = useGetParticipants(isActive)
 
 		return {
@@ -141,7 +140,6 @@ export default {
 			participantsInitialised,
 			cancelableGetParticipants,
 			initialiseGetParticipants,
-			stopGetParticipants,
 		}
 	},
 
@@ -209,7 +207,7 @@ export default {
 		EventBus.$on('route-change', this.abortSearch)
 		subscribe('user_status:status.updated', this.updateUserStatus)
 
-		// Initialises the get participants mixin
+		// Initialises the get participants composable
 		this.initialiseGetParticipants()
 	},
 
@@ -219,8 +217,6 @@ export default {
 
 		this.cancelSearchPossibleConversations()
 		this.cancelSearchPossibleConversations = null
-
-		this.stopGetParticipants()
 	},
 
 	methods: {

diff --git a/src/composables/useGetParticipants.js b/src/composables/useGetParticipants.js
@@ -21,7 +21,7 @@
  *
  */
 import debounce from 'debounce'
-import { ref, nextTick, computed, watch } from 'vue'
+import { ref, nextTick, computed, watch, onBeforeUnmount } from 'vue'
 
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 
@@ -138,10 +138,15 @@ export function useGetParticipants(isActive = ref(true)) {
 		}
 	})
 
+	onBeforeUnmount(
+		() => {
+			stopGetParticipants()
+		}
+	)
+
 	return {
 		participantsInitialised,
 		initialiseGetParticipants,
-		stopGetParticipants,
 		cancelableGetParticipants,
 	}
 }