Skip to content

Conversation

@abhinavkrin
Copy link
Member

@abhinavkrin abhinavkrin commented Jul 23, 2025

Reverts #36156
CORE-1249

@abhinavkrin abhinavkrin requested review from a team as code owners July 23, 2025 10:48
@changeset-bot
Copy link

changeset-bot bot commented Jul 23, 2025

🦋 Changeset detected

Latest commit: cd78879

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

This PR includes changesets to release 37 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/http-router Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/web-ui-registration 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/models Patch
@rocket.chat/network-broker Patch
@rocket.chat/mock-providers Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/ui-voip 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

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jul 23, 2025

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

@abhinavkrin abhinavkrin added this to the 7.9.0 milestone Jul 23, 2025
@abhinavkrin abhinavkrin changed the base branch from develop to release-7.9.0 July 23, 2025 10:50
@abhinavkrin abhinavkrin requested a review from a team as a code owner July 23, 2025 10:50
@abhinavkrin abhinavkrin force-pushed the revert-36156-fix/desktop-notifications-not-respecting-privacy-settings branch from 911e06f to 937fbd2 Compare July 23, 2025 10:51
@github-actions
Copy link
Contributor

github-actions bot commented Jul 23, 2025

PR Preview Action v1.6.2

🚀 View preview at
https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-36503/

Built to branch gh-pages at 2025-07-25 13:41 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@abhinavkrin abhinavkrin force-pushed the revert-36156-fix/desktop-notifications-not-respecting-privacy-settings branch from 937fbd2 to c054cb4 Compare July 23, 2025 10:54
@codecov
Copy link

codecov bot commented Jul 23, 2025

Codecov Report

❌ Patch coverage is 25.00000% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 65.44%. Comparing base (61f9dd8) to head (cd78879).
⚠️ Report is 6 commits behind head on release-7.9.0.

Additional details and impacted files

Impacted file tree graph

@@                Coverage Diff                @@
##           release-7.9.0   #36503      +/-   ##
=================================================
- Coverage          65.70%   65.44%   -0.26%     
=================================================
  Files               3174     3092      -82     
  Lines             105842   104283    -1559     
  Branches           20102    19720     -382     
=================================================
- Hits               69539    68244    -1295     
+ Misses             33624    33430     -194     
+ Partials            2679     2609      -70     
Flag Coverage Δ
e2e 56.97% <0.00%> (-1.10%) ⬇️
unit 70.96% <100.00%> (+0.11%) ⬆️

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

tassoevan
tassoevan previously approved these changes Jul 23, 2025
MartinSchoeler
MartinSchoeler previously approved these changes Jul 24, 2025
window.focus();

const jump = msgId && { jump: msgId };
if (!notification.payload._id || !notification.payload.rid || !notification.payload.name) {
Copy link
Member

Choose a reason for hiding this comment

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

You removed _id and name from the destructing but still being in use here.

Also, rid is already destructured and you're accessing it from the full path.

Copy link
Member Author

@abhinavkrin abhinavkrin Jul 24, 2025

Choose a reason for hiding this comment

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

It is a revert of a previous PR. Since earlier case was also working fine I didnt change anything in the revert PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

pattern: '/direct/:rid/:tab?/:context?',
params: {
rid,
rid: notification.payload.rid,
Copy link
Member

Choose a reason for hiding this comment

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

Why not use the destructured rid?

pattern: '/live/:id/:tab?/:context?',
params: {
id: rid,
id: notification.payload.rid,
Copy link
Member

Choose a reason for hiding this comment

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

Same as before

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.

this is not a regression, it should have changeset and be backported also btw

@FragaKrummenauer FragaKrummenauer added the stat: QA assured Means it has been tested and approved by a company insider label Jul 24, 2025
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jul 24, 2025
Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>
Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>
@ggazzo ggazzo changed the title regression: desktop notifications implementing privacy settings fix: desktop notifications implementing privacy settings Jul 25, 2025
@ggazzo ggazzo merged commit 748a653 into release-7.9.0 Jul 25, 2025
50 checks passed
@ggazzo ggazzo deleted the revert-36156-fix/desktop-notifications-not-respecting-privacy-settings branch July 25, 2025 22:26
@ggazzo
Copy link
Member

ggazzo commented Jul 25, 2025

/patch

dionisio-bot bot pushed a commit that referenced this pull request Jul 25, 2025
Co-authored-by: Guilherme Gazzo <guilherme@gazzo.xyz>
@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jul 25, 2025

Pull request #36545 added to Project: "Patch 7.8.3"

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jul 25, 2025

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-7.7.7-36503
git cherry-pick 748a653267bc7cc3626c216deb1fb28fb855c9b9
// solve the conflict
git push

after that just run /backport 7.7.7 again

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.

8 participants