Skip to content

COMPASS-697: Backport COMPASS-666: Keyboard Enter on Create Collection Modal sometimes cause page refresh to 1.5-releases #758

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

Merged
merged 4 commits into from
Jan 25, 2017
Merged

COMPASS-697: Backport COMPASS-666: Keyboard Enter on Create Collection Modal sometimes cause page refresh to 1.5-releases #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d05e195
COMPASS-697: Backport COMPASS-666: Keyboard Enter on forms cause page…
pzrq Jan 23, 2017
dee0752
COMPASS 443: Standardise mongodb-runner CI (#633)
pzrq Nov 30, 2016
1e57ec2
Standardise on no space
pzrq Jan 25, 2017
5b100c9
Drop data-test-ids we do not need on 1.5-releases
pzrq Jan 25, 2017
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
sudo: required
language: node_js
node_js:
- 6.3.1
Expand Down
10 changes: 8 additions & 2 deletions src/internal-packages/database/lib/components/create-collection-dialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,12 @@ class CreateCollectionDialog extends React.Component {

/**
* Initiate the attempt to create a collection.
* @param {Object} evt - The event object
*/
onCreateCollectionButtonClicked() {
onCreateCollectionButtonClicked(evt) {
evt.preventDefault();
evt.stopPropagation();

this.setState({ inProgress: true, error: false, errorMessage: '' });
Actions.createCollection(
this.state.databaseName,
Expand Down Expand Up @@ -163,7 +167,9 @@ class CreateCollectionDialog extends React.Component {
</Modal.Header>

<Modal.Body>
<form name="create-collection-dialog-form">
<form name="create-collection-dialog-form"
onSubmit={this.onCreateCollectionButtonClicked.bind(this)}
>
<CreateCollectionInput
name="Collection Name"
value={this.state.collectionName}
Expand Down
15 changes: 13 additions & 2 deletions src/internal-packages/database/lib/components/drop-collection-dialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,17 @@ class DropCollectionDialog extends React.Component {

/**
* Initiate the attempt to drop a database.
* @param {Object} evt - The event object
*/
onDropCollectionButtonClicked() {
onDropCollectionButtonClicked(evt) {
evt.preventDefault();
evt.stopPropagation();

// prevent drop of collection if names don't match
if (this.state.confirmName !== this.state.name) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Did we not confirm the typed name is identical before? What was the behaviour for 1.5.1?

Copy link

Choose a reason for hiding this comment

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

Pressing enter would've caused a refresh in 1.5.1, after adding an onSubmit method it would drop the collection without checking if it matches.

return;
}

this.setState({ inProgress: true, error: false, errorMessage: '' });
Actions.dropCollection(this.state.databaseName, this.state.name);
}
Expand Down Expand Up @@ -111,7 +120,9 @@ class DropCollectionDialog extends React.Component {
to drop
</p>
</div>
<form>
<form
onSubmit={this.onDropCollectionButtonClicked.bind(this)}
>
<div className="form-group">
<input
type="text"
Expand Down
10 changes: 8 additions & 2 deletions src/internal-packages/server-stats/lib/component/create-database-dialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,11 @@ class CreateDatabaseDialog extends React.Component {

/**
* Initiate the attempt to create a database.
* @param {Object} evt - The event object
*/
onCreateDatabaseButtonClicked() {
onCreateDatabaseButtonClicked(evt) {
evt.preventDefault();
evt.stopPropagation();
this.setState({ inProgress: true, error: false, errorMessage: '' });
Actions.createDatabase(
this.state.databaseName,
Expand Down Expand Up @@ -186,7 +189,10 @@ class CreateDatabaseDialog extends React.Component {
</Modal.Header>

<Modal.Body>
<form name="create-collection-dialog-form">
<form
name="create-collection-dialog-form"
onSubmit={this.onCreateDatabaseButtonClicked.bind(this)}
>
<this.CreateCollectionInput
name="Database Name"
value={this.state.databaseName}
Expand Down
14 changes: 12 additions & 2 deletions src/internal-packages/server-stats/lib/component/drop-database-dialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,16 @@ class DropDatabaseDialog extends React.Component {

/**
* Initiate the attempt to drop a database.
* @param {Object} evt - The event object
*/
onDropDatabaseButtonClicked() {
onDropDatabaseButtonClicked(evt) {
evt.preventDefault();
evt.stopPropagation();

// prevent drop database if names don't match
if (this.state.confirmName !== this.state.name) {
return;
}
this.setState({ inProgress: true, error: false, errorMessage: '' });
Actions.dropDatabase(this.state.name);
}
Expand Down Expand Up @@ -104,7 +112,9 @@ class DropDatabaseDialog extends React.Component {
to drop
</p>
</div>
<form>
<form
onSubmit={this.onDropDatabaseButtonClicked.bind(this)}
>
<div className="form-group">
<input
type="text"
Expand Down