fix(settings): group connected services by deviceId to avoid name merging#19931
Closed
sreecharan-desu wants to merge 1 commit intomozilla:mainfrom
Closed
fix(settings): group connected services by deviceId to avoid name merging#19931sreecharan-desu wants to merge 1 commit intomozilla:mainfrom
sreecharan-desu wants to merge 1 commit intomozilla:mainfrom
Conversation
2bd418b to
85bb36b
Compare
Contributor
|
Not sure if you can see CI output, but unfortunately this PR does not compile/build. I recommend running the stack locally (which is, admittedly, not easy) before submitting PRs. |
Contributor
Author
|
Thanks for flagging this. I’ve identified the issue with groupedByName in the test and am working on a fix. |
Contributor
Author
Fix Applied
CI is now passing. Thanks for the review. |
2f4d7f3 to
2dd112e
Compare
Contributor
Author
|
Note: This PR was closed while I was fixing the GPG signing and rebasing onto main. I’ve recreated the fix cleanly with a signed commit here: #20041. Thanks for your patience. |
2 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #17370. Devices sharing the same name were incorrectly being merged in the 'Connected Services' list because they were grouped solely by name. This PR changes the grouping logic to use 'deviceId' as the primary key (falling back to 'name' for non-sync clients), ensuring that distinct devices with the same name are correctly shown as separate entries. It also updates the 'disconnect all' logic to correctly handle multiple sessions for the same physical device.