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: validate bhType before registering it #32931

Merged
merged 4 commits into from
Jul 31, 2024
Merged

Conversation

KevLehman
Copy link
Contributor

Proposed changes (including videos or screenshots)

Check if bhType is valid before attempting to register it as the business hour type. This can happen (very rarely) if settings collection on UI is loaded after license (so the check for license returns true and it tries to register).
This will cause the tracker to run again

Issue(s)

https://rocketchat.atlassian.net/browse/CORE-535

Steps to test or reproduce

Further comments

Copy link

changeset-bot bot commented Jul 29, 2024

🦋 Changeset detected

Latest commit: 62067d6

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

This PR includes changesets to release 32 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron 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/api-client Patch
@rocket.chat/ddp-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf 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

dionisio-bot bot commented Jul 29, 2024

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

Copy link

codecov bot commented Jul 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 54.97%. Comparing base (8fb9ef0) to head (62067d6).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32931      +/-   ##
===========================================
+ Coverage    54.96%   54.97%   +0.01%     
===========================================
  Files         2595     2595              
  Lines        55993    55966      -27     
  Branches     11593    11577      -16     
===========================================
- Hits         30779    30770       -9     
+ Misses       22569    22553      -16     
+ Partials      2645     2643       -2     
Flag Coverage Δ
unit 72.98% <ø> (ø)

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

@KevLehman KevLehman added this to the 6.12 milestone Jul 29, 2024
@KevLehman KevLehman marked this pull request as ready for review July 29, 2024 21:05
@ggazzo ggazzo added the stat: QA assured Means it has been tested and approved by a company insider label Jul 31, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jul 31, 2024
@kodiakhq kodiakhq bot merged commit 057e1dd into develop Jul 31, 2024
49 checks passed
@kodiakhq kodiakhq bot deleted the fix/tolowerofundefined branch July 31, 2024 18:42
gabriellsh added a commit that referenced this pull request Aug 5, 2024
…ove/threadMetrics

* 'develop' of github.com:RocketChat/Rocket.Chat: (22 commits)
  chore: saveAnalyticsData with accumulator (#32961)
  regression: fix dispatchInquiryPosition not being fired on room creation (#32972)
  chore: create `orm` for specific cases (#32948)
  chore: create `afterOmnichannelSaveMessage` (#32970)
  fix: `Menu` onPointerUp event behavior (#32968)
  Release 6.11.0-rc.2
  feat: add `Advanced settings` on create Team and Channel (#32867)
  Revert "fix: Login services button colors" (#32955)
  chore: Use index on `unlockAll` query called when changing OM routing methods (#32860)
  chore: Exclude Storybook stories from the build of `@rocket.chat/ui-composer` (#32944)
  chore: Remove `ui-kit` from `yarn fuselage` script (#32942)
  Release 6.10.2
  fix: Client crashing on firefox private window (#32950)
  fix: Apps-Engine patch (#32935)
  test: Remove mockDate and fix unit tests (#32947) (#32949)
  fix: validate `bhType` before registering it (#32931)
  test: Remove mockDate and fix unit tests (#32947)
  Bump 6.10.2
  Release 6.11.0-rc.1
  regression: notify user properly on logout (#32920)
  ...
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.

4 participants