[v16] Allow displaying hardware keys prompts when relogin is in progress#49702
Merged
gzdunek merged 4 commits intobranch/v16from Dec 4, 2024
Merged
[v16] Allow displaying hardware keys prompts when relogin is in progress#49702gzdunek merged 4 commits intobranch/v16from
gzdunek merged 4 commits intobranch/v16from
Conversation
gzdunek
added
the
no-changelog
ravicious
approved these changes
Dec 3, 2024
Member
Ooof, that's rough. But at least I'm fairly sure that we won't be backporting the TypeScript modal changes to v16. |
kiosion
approved these changes
Dec 4, 2024
public-teleport-github-review-bot
Bot
removed the request for review
from Joerger
…48813) * Convert `DialogConfirmation` to TS * Allow `DialogConfirmation` and `Modal` to be hidden using CSS while closed * Allow hiding all dialogs that are displayed as important * Allow displaying multiple important dialogs, separate regular and important dialogs and get rid of `DialogNone` * Pass `hidden` prop to important dialogs * Rename `importantModalSemaphore` to `singleImportantModalSemaphore` * Remove semaphores from hardware key prompts * `keepMounted` -> `keepInDOMAfterClose` * Remove the explicit value from `keepInDOMAfterClose` * Revert splitting dialogs into regular and important ones, pass `hidden` to all of them, hide regular modal when important one is visible * Use random id as a modal key * Improve `singleImportantModalSemaphore` comment * Improve `NewHardwareKeyPromptConstructor` comment * Do not acquire important modal semaphore in MFA prompt and relogin, give each prompt its own mutex/semaphore (cherry picked from commit 7428128)
) (cherry picked from commit 7b520cc)
…ailable in `styled-components` in branch/v16
gzdunek
force-pushed
the
gzdunek/backport-48813/v16
branch
from
ed5cebd to
7604043
Compare
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
3 participants
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.
Backport #48813 to branch/v16
Backport #49061 to branch/v16
The only major conflict was in
Modal.jsx. In newer branches we haveModal.tsxso I basically had to reapply changes made there in the JSX file.