Skip to content

[FIX] Omnichannel - Fix issue with modals on room preview mode. #22541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renatobecker merged 3 commits into from
Jul 5, 2021
Merged

[FIX] Omnichannel - Fix issue with modals on room preview mode. #22541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7072ce1
Await error on main thread so meteor can handle it
KevLehman Jul 1, 2021
09ab864
Fix an issue where clicking esc would trigger a room read on unsubscr…
KevLehman Jul 2, 2021
acbcf15
Merge branch 'develop' into fix/omnichannel-subscription-error-kills-…
renatobecker Jul 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/ui-utils/client/lib/readMessages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export const readMessage = new class extends Emitter {
return;
}


const subscription = ChatSubscription.findOne({ rid });
if (subscription == null) {
this.log('readMessage -> readNow canceled, no subscription found for rid:', rid);
Expand Down Expand Up @@ -71,6 +70,13 @@ export const readMessage = new class extends Emitter {
this.log('readMessage -> readNow canceled, no rid informed');
return;
}

const subscription = ChatSubscription.findOne({ rid });
if (subscription == null) {
this.log('readMessage -> readNow canceled, no subscription found for rid:', rid);
return;
}

return Meteor.call('readMessages', rid, () => {
RoomHistoryManager.getRoom(rid).unreadNotLoaded.set(0);
return this.emit(rid);
Expand Down
2 changes: 1 addition & 1 deletion server/methods/readMessages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ Meteor.methods({
throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'readMessages' });
}

markRoomAsRead(rid, userId);
Promise.await(markRoomAsRead(rid, userId));
},
});