From 507c9838169e4e9431e039e9fadd33d0b6883c01 Mon Sep 17 00:00:00 2001 From: Maksim Sukharev Date: Mon, 24 Apr 2023 15:05:40 +0200 Subject: [PATCH 1/6] check if participant belongs to conversation Signed-off-by: Maksim Sukharev --- .../Participants/CurrentParticipants/CurrentParticipants.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue b/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue index b3bd358a257..d90bc2342bb 100644 --- a/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue +++ b/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue @@ -112,7 +112,7 @@ export default { methods: { userStatusUpdated(state) { - if (this.token) { + if (this.token && this.participantsList.find(participant => participant.actorId === state.userId)) { this.$store.dispatch('updateUser', { token: this.token, participantIdentifier: { From 720c280161dee9470bf83e8c44678d8a602e1dfe Mon Sep 17 00:00:00 2001 From: Maksim Sukharev Date: Mon, 24 Apr 2023 15:47:09 +0200 Subject: [PATCH 2/6] change icon for moderators with custom permissions Signed-off-by: Maksim Sukharev --- .../Participants/ParticipantsList/Participant/Participant.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue index 028c4188cca..b490f9e4a23 100644 --- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue +++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue @@ -603,6 +603,10 @@ export default { }, actionIcon() { + if (this.isModerator) { + return '' + } + if (this.attendeePermissions === PARTICIPANT.PERMISSIONS.MAX_CUSTOM) { return 'LockOpenVariant' } else if (this.attendeePermissions === PARTICIPANT.PERMISSIONS.CUSTOM) { From d5fcc1324eb61292a22c250b9ce6b6031d9ca2e7 Mon Sep 17 00:00:00 2001 From: Antreesy Date: Tue, 25 Apr 2023 08:32:56 +0200 Subject: [PATCH 3/6] remove nextTick when join the call and switch between tabs Signed-off-by: Antreesy --- src/components/RightSidebar/RightSidebar.vue | 37 +++++++++----------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue index 26dea0e5428..77eb607ddae 100644 --- a/src/components/RightSidebar/RightSidebar.vue +++ b/src/components/RightSidebar/RightSidebar.vue @@ -300,26 +300,23 @@ export default { }, isInCall(newValue) { - // Waiting for chat tab to mount / destroy - this.$nextTick(() => { - if (newValue) { - // Set 'chat' tab as active, and switch to it if sidebar is open - this.activeTab = 'chat' - return - } - - // If 'chat' tab wasn't active, leave it as is - if (this.activeTab !== 'chat') { - return - } - - // In other case switch to other tabs - if (this.isOneToOne) { - this.activeTab = 'shared-items' - } else { - this.activeTab = 'participants' - } - }) + if (newValue) { + // Set 'chat' tab as active, and switch to it if sidebar is open + this.activeTab = 'chat' + return + } + + // If 'chat' tab wasn't active, leave it as is + if (this.activeTab !== 'chat') { + return + } + + // In other case switch to other tabs + if (this.isOneToOne) { + this.activeTab = 'shared-items' + } else { + this.activeTab = 'participants' + } }, token() { From 457991ae4f9a9e16570e596b331bf0b66047c3c1 Mon Sep 17 00:00:00 2001 From: Maksim Sukharev Date: Tue, 25 Apr 2023 15:30:02 +0200 Subject: [PATCH 4/6] remove deprecated slot syntax and redundant code Signed-off-by: Maksim Sukharev --- src/components/RightSidebar/RightSidebar.vue | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue index 77eb607ddae..bd72474b0d2 100644 --- a/src/components/RightSidebar/RightSidebar.vue +++ b/src/components/RightSidebar/RightSidebar.vue @@ -29,14 +29,14 @@ @update:active="handleUpdateActive" @closed="handleClosed" @close="handleClose"> -