-
Notifications
You must be signed in to change notification settings - Fork 38
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
Extract and refactor clear queue dialog #1419
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,46 @@ | ||
| /* eslint-disable react/jsx-handler-names */ | ||
| import React from 'react'; | ||
| import { Modal, Button } from 'react-bootstrap'; | ||
|
|
||
| export default class ConfirmActionDialog extends React.Component { | ||
| constructor(props) { | ||
| super(props); | ||
| this.onOkClick = this.onOkClick.bind(this); | ||
| this.onCancelClick = this.onCancelClick.bind(this); | ||
| } | ||
| function ConfirmActionDialog(props) { | ||
| const { | ||
| title, | ||
| okBtnLabel = 'OK', | ||
| cancelBtnLabel = 'Cancel', | ||
| show = false, | ||
| children, | ||
| onHide, | ||
| onOk, | ||
| onCancel, | ||
| } = props; | ||
|
|
||
| onOkClick() { | ||
| if (this.props.onOk) { | ||
| this.props.onOk(); | ||
| } | ||
|
|
||
| this.props.hide(); | ||
| } | ||
|
|
||
| onCancelClick() { | ||
| if (this.props.onCancel) { | ||
| this.props.onCancel(); | ||
| } | ||
|
|
||
| this.props.hide(); | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <Modal show={this.props.show}> | ||
| <Modal.Header> | ||
| <Modal.Title>{this.props.title}</Modal.Title> | ||
| </Modal.Header> | ||
| <Modal.Body>{this.props.message}</Modal.Body> | ||
| <Modal.Footer> | ||
| <Button variant="outline-secondary" onClick={this.onCancelClick}> | ||
| {this.props.cancelButtonText} | ||
| </Button> | ||
| <Button variant="outline-secondary" onClick={this.onOkClick}> | ||
| {this.props.okButtonText} | ||
| </Button> | ||
| </Modal.Footer> | ||
| </Modal> | ||
| ); | ||
| } | ||
| return ( | ||
| <Modal show={show} data-default-styles onHide={onHide}> | ||
| <Modal.Header> | ||
| <Modal.Title>{title}</Modal.Title> | ||
| </Modal.Header> | ||
| <Modal.Body>{children}</Modal.Body> | ||
| <Modal.Footer> | ||
| <Button | ||
| variant="warning" | ||
| onClick={() => { | ||
| onOk?.(); | ||
| onHide(); | ||
| }} | ||
| > | ||
| {okBtnLabel} | ||
| </Button> | ||
| <Button | ||
| variant="outline-secondary" | ||
| onClick={() => { | ||
| onCancel?.(); | ||
| onHide(); | ||
| }} | ||
| > | ||
| {cancelBtnLabel} | ||
| </Button> | ||
| </Modal.Footer> | ||
| </Modal> | ||
| ); | ||
| } | ||
|
|
||
| ConfirmActionDialog.defaultProps = { | ||
| show: false, | ||
| title: '', | ||
| message: '', | ||
| okButtonText: 'Ok', | ||
| cancelButtonText: 'Cancel', | ||
| onOk: false, | ||
| onCancel: false, | ||
| }; | ||
| export default ConfirmActionDialog; |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import React from 'react'; | ||
| import ConfirmActionDialog from '../GenericDialog/ConfirmActionDialog'; | ||
| import { useDispatch, useSelector } from 'react-redux'; | ||
| import { clearQueue } from '../../actions/queue'; | ||
| import { showConfirmClearQueueDialog } from '../../actions/general'; | ||
|
|
||
| function ClearQueueDialog() { | ||
| const dispatch = useDispatch(); | ||
| const show = useSelector( | ||
| (state) => state.general.showConfirmClearQueueDialog, | ||
| ); | ||
|
|
||
| return ( | ||
| <ConfirmActionDialog | ||
| title="Clear sample list?" | ||
| okBtnLabel="Clear" | ||
| show={show} | ||
| onOk={() => dispatch(clearQueue())} | ||
| onHide={() => dispatch(showConfirmClearQueueDialog(false))} | ||
| > | ||
| This will also <strong>clear the queue</strong>. | ||
| </ConfirmActionDialog> | ||
| ); | ||
| } | ||
|
|
||
| export default ClearQueueDialog; |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, this dialog only makes sense in the context of the Samples page, but it doesn't really matter since its state is managed globally. I prefer to have all the dialogs in one place. It might uncover opportunities to simplify the global state and combine a few dialogs together into more general abstractions.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it would be nice to only have, if possible, one main dialog component