Skip to content

Fix a mistake causing document reopen dialog to be always hidden#49061

Merged
gzdunek merged 1 commit intomasterfrom
gzdunek/fix-document-reopen
Nov 15, 2024
Merged

Fix a mistake causing document reopen dialog to be always hidden#49061
gzdunek merged 1 commit intomasterfrom
gzdunek/fix-document-reopen

Conversation

@gzdunek
Copy link
Copy Markdown
Contributor

@gzdunek gzdunek commented Nov 15, 2024

I wanted to type hidden and autocomplete changed it to history and I didn't notice it 🤦
I verified other dialogs, they are fine.

@gzdunek gzdunek added the no-changelog Indicates that a PR does not require a changelog entry label Nov 15, 2024
@gzdunek gzdunek enabled auto-merge November 15, 2024 15:41

return (
<DialogConfirmation
open={!history}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Heh, I'm not sure if there's a single lint rule which would help here. :D Even no-implicit-coercion wouldn't catch this. https://eslint.org/docs/latest/rules/no-implicit-coercion

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@gzdunek gzdunek added this pull request to the merge queue Nov 15, 2024
Merged via the queue into master with commit 7b520cc Nov 15, 2024
@gzdunek gzdunek deleted the gzdunek/fix-document-reopen branch November 15, 2024 16:03
@public-teleport-github-review-bot
Copy link
Copy Markdown

@gzdunek See the table below for backport results.

Branch Result
branch/v17 Create PR

gzdunek added a commit that referenced this pull request Dec 3, 2024
gzdunek added a commit that referenced this pull request Dec 4, 2024
github-merge-queue Bot pushed a commit that referenced this pull request Dec 4, 2024
…ess (#49702)

* Allow displaying hardware keys prompts when relogin is in progress (#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)

* Re-add `keepInDOMAfterClose` to `Modal.jsx`

* Fix a mistake causing document reopen dialog to be always hidden (#49061)

(cherry picked from commit 7b520cc)

* Change `dialogCss` type to `any` since there is no `StyleFunction` available in `styled-components` in branch/v16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/branch/v17 merge-for-v17 no-changelog Indicates that a PR does not require a changelog entry size/sm ui

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants