Skip to content

Bug 2027742 - Adding notes to an alert sometimes redirects to Perfherder alerts page with editableNotes URL parameter #9482

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.

Sign up for GitHub

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

Open
davidmiculit wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −14
Open

Bug 2027742 - Adding notes to an alert sometimes redirects to Perfherder alerts page with editableNotes URL parameter #9482

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions ui/perfherder/alerts/NotesModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,45 @@ export default class NotesModal extends React.Component {
constructor(props) {
super(props);
this.state = {
inputValue: this.props.alertSummary.notes,
inputValue: this.props.alertSummary.notes || '',
};
}

updateInput = (event) => {
this.setState({ inputValue: event.target.value });
};

handleSubmit = (event) => {
event.preventDefault();

const { updateAndClose } = this.props;
const { inputValue } = this.state;

updateAndClose(
event,
{
notes: inputValue.length ? inputValue : null,
},
'showNotesModal',
);
};

render() {
const { showModal, toggle, alertSummary, updateAndClose } = this.props;
const { showModal, toggle, alertSummary } = this.props;
const { inputValue } = this.state;

return (
<Modal show={showModal} onHide={toggle}>
<Modal.Header closeButton>
<Modal.Title>Alert Notes</Modal.Title>
</Modal.Header>
<Form>
<Form onSubmit={this.handleSubmit}>
<Modal.Body>
<Form.Group>
<Form.Label htmlFor="editableNotes">Add or edit notes</Form.Label>
<Form.Control
value={inputValue || ''}
id="editableNotes"
value={inputValue}
onChange={this.updateInput}
name="editableNotes"
as="textarea"
Expand All @@ -40,16 +56,7 @@ export default class NotesModal extends React.Component {
<Modal.Footer>
<Button
variant="secondary"
onClick={(event) =>
updateAndClose(
event,
{
notes: inputValue.length ? inputValue : null,
},
'showNotesModal',
)
}
disabled={inputValue === alertSummary.notes}
disabled={inputValue === (alertSummary.notes || '')}
type="submit"
>
Save
Expand Down