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

fix: Waiting Queue feature not queueing rooms #33772

Merged
merged 10 commits into from
Nov 7, 2024
Merged

Conversation

KevLehman
Copy link
Contributor

@KevLehman KevLehman commented Oct 24, 2024

Proposed changes (including videos or screenshots)

  • Add new check to getStatus call, to return the chat as "queued" when waiting queue is enabled
  • Change beforeRouteChat callback to return an inquiry, and update caller to use the returned inq instead of finding it again.
  • Tests for waiting queue when running autoselection algorithms

Issue(s)

https://rocketchat.atlassian.net/browse/SUP-663

Steps to test or reproduce

Further comments

Copy link
Contributor

dionisio-bot bot commented Oct 24, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

Copy link

changeset-bot bot commented Oct 24, 2024

🦋 Changeset detected

Latest commit: f28702f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 35 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/freeswitch Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/network-broker Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/ui-voip Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link
Contributor

github-actions bot commented Oct 24, 2024

PR Preview Action v1.4.8
🚀 Deployed preview to https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-33772/
on branch gh-pages at 2024-11-07 18:42 UTC

Copy link

codecov bot commented Oct 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.20%. Comparing base (1eca1fb) to head (f28702f).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           develop   #33772   +/-   ##
========================================
  Coverage    75.20%   75.20%           
========================================
  Files          495      495           
  Lines        21595    21595           
  Branches      5362     5362           
========================================
  Hits         16240    16240           
  Misses        4713     4713           
  Partials       642      642           
Flag Coverage Δ
unit 75.20% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

ggazzo
ggazzo previously requested changes Oct 25, 2024
Copy link
Member

@ggazzo ggazzo left a comment

Choose a reason for hiding this comment

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

what do you think about starting with testing? then we can decide the best solution to fix

apps/meteor/app/livechat/server/lib/QueueManager.ts Outdated Show resolved Hide resolved
@KevLehman KevLehman requested a review from ggazzo October 26, 2024 00:24
@KevLehman KevLehman changed the title fix: Waiting Queue not working fix: Waiting Queue feature not queueing rooms Oct 28, 2024
@KevLehman KevLehman changed the title fix: Waiting Queue feature not queueing rooms fix: Waiting Queue feature not queueing rooms Oct 28, 2024
@KevLehman KevLehman marked this pull request as ready for review October 28, 2024 19:43
@KevLehman KevLehman requested review from a team as code owners October 28, 2024 19:43
@KevLehman KevLehman added this to the 7.1.0 milestone Oct 28, 2024
tiagoevanp
tiagoevanp previously approved these changes Oct 28, 2024
@KevLehman KevLehman added the stat: QA assured Means it has been tested and approved by a company insider label Nov 6, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Nov 6, 2024
@kodiakhq kodiakhq bot merged commit 4d0ab19 into develop Nov 7, 2024
48 checks passed
@kodiakhq kodiakhq bot deleted the fix/waitingqueue branch November 7, 2024 19:12
@scuciatto
Copy link
Member

/patch

Copy link
Contributor

dionisio-bot bot commented Nov 22, 2024

    Sorry, I couldn't do that backport because of conflicts. Could you please solve them?
    
    you can do so by running the following commands:
git fetch
git checkout backport-6.10.8-33772
git cherry-pick 4d0ab190ec7e6a2bf9b2809697d5edb87a0ab4ab
// solve the conflict
git push

after that just run /patch again

@ggazzo
Copy link
Member

ggazzo commented Nov 22, 2024

/patch

Copy link
Contributor

dionisio-bot bot commented Nov 22, 2024

Pull request #34035 added to Project: "undefined"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants