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: Blocked login when dismissed 2FA modal #32482

Merged
merged 12 commits into from
Jul 19, 2024

Conversation

tiagoevanp
Copy link
Contributor

@tiagoevanp tiagoevanp commented May 23, 2024

Proposed changes (including videos or screenshots)

Fix infinite loading button in login page when 2FA dismissed.
PR introduces the possibility of a function trigger to Modal dismiss (outside click and escape key).

Before:
bad

After:
cool

Issue(s)

Steps to test or reproduce

Further comments

CORE-202

Copy link

changeset-bot bot commented May 23, 2024

🦋 Changeset detected

Latest commit: c3e0ca9

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

This PR includes changesets to release 33 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/mock-providers Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/ui-client Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript 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/model-typings Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/api-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/ddp-client Patch
@rocket.chat/models 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 May 23, 2024

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

Copy link

codecov bot commented May 23, 2024

Codecov Report

Attention: Patch coverage is 94.87179% with 2 lines in your changes missing coverage. Please review.

Project coverage is 55.58%. Comparing base (ebc858f) to head (c3e0ca9).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32482      +/-   ##
===========================================
- Coverage    55.59%   55.58%   -0.02%     
===========================================
  Files         2634     2634              
  Lines        57252    57273      +21     
  Branches     11857    11860       +3     
===========================================
+ Hits         31832    31837       +5     
- Misses       22729    22750      +21     
+ Partials      2691     2686       -5     
Flag Coverage Δ
e2e 54.30% <87.09%> (-0.06%) ⬇️
unit 72.33% <94.87%> (+0.22%) ⬆️

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

@tiagoevanp tiagoevanp marked this pull request as ready for review May 23, 2024 20:42
@tiagoevanp tiagoevanp requested a review from a team as a code owner May 23, 2024 20:42
Copy link
Member

@MarcosSpessatto MarcosSpessatto left a comment

Choose a reason for hiding this comment

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

I know the steps to reproduce the issue are complex, but would it be possible to add some UI tests to ensure the behavior? Executing exactly the steps you attached in the GIF, enabling 2FA, typing user name and pass, pressing ESC, and checking if the login button is enabled?

.changeset/soft-donkeys-thank.md Outdated Show resolved Hide resolved
@tassoevan tassoevan force-pushed the fix/escape-modal-trigger-action branch from 8c3bdfd to 9e919b3 Compare July 3, 2024 04:32
@tassoevan tassoevan force-pushed the fix/escape-modal-trigger-action branch from 4df72a9 to bce65a7 Compare July 4, 2024 04:23
MarcosSpessatto
MarcosSpessatto previously approved these changes Jul 5, 2024
@MarcosSpessatto MarcosSpessatto added this to the 6.11 milestone Jul 5, 2024
tassoevan
tassoevan previously approved these changes Jul 8, 2024
@tiagoevanp tiagoevanp added the stat: QA assured Means it has been tested and approved by a company insider label Jul 19, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jul 19, 2024
@kodiakhq kodiakhq bot merged commit 4e8aa57 into develop Jul 19, 2024
48 checks passed
@kodiakhq kodiakhq bot deleted the fix/escape-modal-trigger-action branch July 19, 2024 19:36
debdutdeb pushed a commit that referenced this pull request Jul 31, 2024
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.

3 participants