Skip to content
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.

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

refactor: omnichannel on-hold feature #28252

Merged
merged 46 commits into from
Jun 15, 2023
Merged

refactor: omnichannel on-hold feature #28252

merged 46 commits into from
Jun 15, 2023

Conversation

murtaza98
Copy link
Contributor

@murtaza98 murtaza98 commented Mar 3, 2023

Proposed changes (including videos or screenshots)

Issue(s)

Also fixes: Resume on-hold chat not working with max-chat's allowed per agent config (OC-529)

Steps to test or reproduce

Further comments

Note: this only fixes the issue in https://rocketchat.atlassian.net/browse/OC-529 which was caused by Subscription collection not having onHold prop. I also some further refactoring of the on-hold feature which can be found here -> #28306

@codecov

This comment was marked as outdated.

@murtaza98 murtaza98 marked this pull request as ready for review March 7, 2023 11:59
@murtaza98 murtaza98 requested review from a team as code owners March 7, 2023 11:59
@murtaza98 murtaza98 changed the title [FIX] Resume on-hold chat not working with max-chat's allowed per agent config fix: Resume on-hold chat not working with max-chat's allowed per agent config Mar 14, 2023
@murtaza98 murtaza98 dismissed aleksandernsilva’s stale review March 14, 2023 14:42

done with the changes, thanks Alek :)

cauefcr
cauefcr previously approved these changes Mar 14, 2023
Copy link
Contributor

@cauefcr cauefcr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simple and good changes, approving.

@murtaza98 murtaza98 added this to the 6.1.0 milestone Mar 17, 2023
@murtaza98 murtaza98 requested a review from cauefcr March 23, 2023 12:23
@murtaza98 murtaza98 requested a review from a team as a code owner March 23, 2023 12:23
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Jun 13, 2023
@kodiakhq kodiakhq bot removed the stat: ready to merge PR tested and approved waiting for merge label Jun 13, 2023
@kodiakhq
Copy link
Contributor

kodiakhq bot commented Jun 13, 2023

This PR currently has a merge conflict. Please resolve this and then re-add the ['stat: ready to merge', 'automerge'] label.

@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: conflict labels Jun 14, 2023
@murtaza98
Copy link
Contributor Author

Hello @KevLehman @aleksandernsilva @ggazzo Could you please re-approve this PR? Your previous approvals got lost while solving conflicts

@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Jun 15, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Jun 15, 2023
@kodiakhq kodiakhq bot merged commit 9da856c into develop Jun 15, 2023
@kodiakhq kodiakhq bot deleted the OC-529 branch June 15, 2023 05:39
gabriellsh added a commit that referenced this pull request Jun 15, 2023
…to fix/slash-stub

* 'fix/slash-stub' of github.com:RocketChat/Rocket.Chat:
  fix: Unable to open Releases inside App info (#29418)
  ci: improve engagement dashboard selectors (#29541)
  fix: re-added pagination to department's agents table (#29523)
  chore: add message body fallback while markup is loading (#29550)
  fix: spotlight reacts to new rooms (#29547)
  fix: Emoji being rendered as big (#29493)
  refactor: omnichannel on-hold feature (#28252)
  refactor: Livechat Button to TS (#29535)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants