MEN-7068: add spinner for "Waiting for device" button #4383
Conversation
This file contains 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
|
@mineralsfree, Let me know if you want to start the integration pipeline by mentioning me and the command "start pipeline". my commands and optionsYou can trigger a pipeline on multiple prs with:
You can start a fast pipeline, disabling full integration tests with:
You can trigger GitHub->GitLab branch sync with:
You can cherry pick to a given branch or branches with:
|
| @@ -174,8 +175,9 @@ export const DeviceConnectionDialog = ({ onCancel }) => { | |||
| Next | |||
| </Button> | |||
| ) : ( | |||
| <Button variant="contained" disabled={!onboardingComplete} onClick={onCancel}> | |||
| <Button variant="contained" disabled={!onboardingComplete} onClick={onCancel} style={{ height: '37px' }}> | |||
There was a problem hiding this comment.
why do you need custom height here?
There was a problem hiding this comment.
otherwise the loader increases default button height, so we want to force it
mzedel
reviewed
May 14, 2024
Comment on lines
178
to
180
| <Button variant="contained" disabled={!onboardingComplete} onClick={onCancel} style={{ height: '37px' }}> | ||
| {onboardingComplete ? 'Close' : 'Waiting for device'} | ||
| <Loader show={!onboardingComplete} small style={{ marginTop: '-5px' }} /> |
There was a problem hiding this comment.
Suggested change
| <Button variant="contained" disabled={!onboardingComplete} onClick={onCancel} style={{ height: '37px' }}> | |
| {onboardingComplete ? 'Close' : 'Waiting for device'} | |
| <Loader show={!onboardingComplete} small style={{ marginTop: '-5px' }} /> | |
| <Button variant="contained" disabled={!onboardingComplete} onClick={onCancel} endIcon={!onboardingComplete && <Loader show small table style={{ top: -24 }} />}> | |
| {onboardingComplete ? 'Close' : 'Waiting for device'} |
with the 24px resetting the top: -5px from the loader container and making room for the margin-top: 24px from the loader itself
mzedel
approved these changes
May 15, 2024
Ticket: MEN-7068 Changelog: None Signed-off-by: Mikita Pilinka <mikita.pilinka@northern.tech>
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.
Screencast.from.2024-04-30.14-18-42.mp4
Ticket: MEN-7068
Changelog: None