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

[v16] Allow displaying hardware keys prompts when relogin is in progress #49702

Merged
merged 4 commits into from
Dec 4, 2024

Conversation

gzdunek
Copy link
Contributor

@gzdunek gzdunek commented Dec 3, 2024

Backport #48813 to branch/v16
Backport #49061 to branch/v16

The only major conflict was in Modal.jsx. In newer branches we have Modal.tsx so I basically had to reapply changes made there in the JSX file.

@gzdunek gzdunek added the no-changelog Indicates that a PR does not require a changelog entry label Dec 3, 2024
@github-actions github-actions bot requested review from kiosion and ravicious December 3, 2024 15:18
@gzdunek gzdunek requested review from Joerger and removed request for kiosion December 3, 2024 15:19
@ravicious
Copy link
Member

The only major conflict was in Modal.jsx. In newer branches we have Modal.tsx so I basically had to reapply changes made there in the JSX file.

Ooof, that's rough. But at least I'm fairly sure that we won't be backporting the TypeScript modal changes to v16.

@public-teleport-github-review-bot public-teleport-github-review-bot bot removed the request for review from Joerger December 4, 2024 00:23
Base automatically changed from gzdunek/backport-47652-v16 to branch/v16 December 4, 2024 17:22
gzdunek and others added 4 commits December 4, 2024 18:22
…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)
…ailable in `styled-components` in branch/v16
@gzdunek gzdunek force-pushed the gzdunek/backport-48813/v16 branch from ed5cebd to 7604043 Compare December 4, 2024 17:23
@gzdunek gzdunek enabled auto-merge December 4, 2024 17:23
@gzdunek gzdunek added this pull request to the merge queue Dec 4, 2024
Merged via the queue into branch/v16 with commit f0d0e91 Dec 4, 2024
43 checks passed
@gzdunek gzdunek deleted the gzdunek/backport-48813/v16 branch December 4, 2024 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-changelog Indicates that a PR does not require a changelog entry size/md ui
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants