diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2021-12-01 16:11:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-01 16:11:27 +0300 |
| commit | 94be61f3cf0f165f9889f58236764ce7e4387402 (patch) | |
| tree | 6cb2585d54e2f674d86e3f36a0e2bda67d412012 | |
| parent | 34ac46b028cd511bc50a85e5df922688630011b8 (diff) | |
| parent | 1c236e28a7ed9db327e553191423b4d1167b14fc (diff) | |
Merge pull request #6643 from nextcloud/backport/6641/stable23
[stable23] Await adding the participant before updating the user status
| -rw-r--r-- | src/components/RightSidebar/Participants/ParticipantsTab.vue | 8 | ||||
| -rw-r--r-- | src/store/participantsStore.js | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue index ba9b59da3..3ca744e34 100644 --- a/src/components/RightSidebar/Participants/ParticipantsTab.vue +++ b/src/components/RightSidebar/Participants/ParticipantsTab.vue @@ -266,11 +266,11 @@ export default { const { request, cancel } = CancelableRequest(fetchParticipants) this.cancelGetParticipants = cancel const participants = await request(token) - this.$store.dispatch('purgeParticipantsStore', token) + await this.$store.dispatch('purgeParticipantsStore', token) const hasUserStatuses = !!participants.headers['x-nextcloud-has-user-statuses'] - participants.data.ocs.data.forEach(participant => { - this.$store.dispatch('addParticipant', { + for (const participant of participants.data.ocs.data) { + await this.$store.dispatch('addParticipant', { token, participant, }) @@ -290,7 +290,7 @@ export default { userId: participant.actorId, }) } - }) + } this.participantsInitialised = true } catch (exception) { if (!Axios.isCancel(exception)) { diff --git a/src/store/participantsStore.js b/src/store/participantsStore.js index 56c6e11ee..5fa69e098 100644 --- a/src/store/participantsStore.js +++ b/src/store/participantsStore.js @@ -341,7 +341,7 @@ const actions = { updateSessionId({ commit, getters }, { token, participantIdentifier, sessionId }) { const attendee = getters.findParticipant(token, participantIdentifier) if (!attendee) { - console.error('Participant not found', participantIdentifier) + console.error('Participant not found for conversation', token, participantIdentifier) return } @@ -355,7 +355,7 @@ const actions = { updateUser({ commit, getters }, { token, participantIdentifier, updatedData }) { const attendee = getters.findParticipant(token, participantIdentifier) if (!attendee) { - console.error('Participant not found', participantIdentifier) + console.error('Participant not found for conversation', token, participantIdentifier) return } @@ -370,7 +370,7 @@ const actions = { const attendee = getters.findParticipant(token, participantIdentifier) if (!attendee) { - console.error('Participant not found', participantIdentifier) + console.error('Participant not found for conversation', token, participantIdentifier) return } @@ -405,7 +405,7 @@ const actions = { const attendee = getters.findParticipant(token, participantIdentifier) if (!attendee) { - console.error('Participant not found', participantIdentifier) + console.error('Participant not found for conversation', token, participantIdentifier) return } |