fix: remove 'Cancel' on submission to avoid data loss (fixes #162)

common-voice · Apr 14, 2019 · 0cb4065 · 0cb4065
1 parent 2dd26f7
commit 0cb4065
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 36 deletions.
diff --git a/web/src/actions/index.js b/web/src/actions/index.js
@@ -21,8 +21,6 @@ export const ACTION_SUBMIT_SENTENCES_REQUEST = 'SUBMIT_SENTENCES_REQUEST';
 export const ACTION_SUBMIT_SENTENCES_SUCCESS = 'SUBMIT_SENTENCES_SUCCESS';
 export const ACTION_SUBMIT_SENTENCES_FAILURE_SINGLE = 'SUBMIT_SENTENCES_FAILURE_SINGLE';
 
-export const ACTION_RESET_STATE = 'ACTION_RESET_STATE';
-
 const VALID_USERNAME_CHARACTERS = /^[a-zA-Z0-9]+$/;
 
 export function login(username, password) {
@@ -221,10 +219,3 @@ export function submitSentencesFailureSingle(errors) {
     errors,
   };
 }
-
-export function resetFullState() {
-  return {
-    type: ACTION_RESET_STATE,
-  };
-}
-
diff --git a/web/src/components/confirm-form.jsx b/web/src/components/confirm-form.jsx
@@ -10,7 +10,6 @@ class ConfirmForm extends React.Component {
     this.state = {};
     this.onSubmit = this.onSubmit.bind(this);
     this.onReview = this.props.onReview.bind(this);
-    this.onCancel = this.props.onCancel.bind(this);
   }
 
   onSubmit(evt) {
@@ -79,8 +78,6 @@ class ConfirmForm extends React.Component {
             <button type="submit" disabled={readyCount === 0}>Confirm</button>
           }
 
-          <button onClick={this.onCancel}>Cancel</button>
-
           { this.state.pendingSentences && (
             <div>
               <p className="loadingText">Sentences are being uploaded. This can take several minutes depending on the number of sentences added.
@@ -93,7 +90,7 @@ class ConfirmForm extends React.Component {
 
         { Object.keys(filtered).length > 0 && (
           <section>
-            <h2>Filtered sentences due to requirements failing:</h2>
+            <h2>Filtered sentences due to requirements failing (please submit fixed versions as new sentences):</h2>
             <p>Please check the <a href="https://common-voice.github.io/sentence-collector/#/how-to">guidelines</a>.</p>
 
             {

diff --git a/web/src/components/pages/add.jsx b/web/src/components/pages/add.jsx
@@ -31,7 +31,6 @@ export default class Add extends React.Component {
 
     this.onSubmit = this.onSubmit.bind(this);
     this.onConfirm = this.onConfirm.bind(this);
-    this.onCancel = this.onCancel.bind(this);
     this.onReview = this.onReview.bind(this);
     this.onReviewed = this.onReviewed.bind(this);
   }
@@ -40,11 +39,6 @@ export default class Add extends React.Component {
     this.setState(DEFAULT_STATE);
   }
 
-  resetFullState() {
-    this.resetState();
-    this.props.resetFullState();
-  }
-
   getLanguageInput() {
     const input = document.querySelector('#add-form select');
     return input && input.value;
@@ -161,11 +155,6 @@ export default class Add extends React.Component {
     }
   }
 
-  onCancel(evt) {
-    evt.preventDefault();
-    this.resetFullState();
-  }
-
   onReview() {
     this.setState({
       reviewing: this.state.unreviewed,
@@ -207,7 +196,6 @@ export default class Add extends React.Component {
       // The confirm form is a stats page where sentence submission happens.
       return <ConfirmForm onSubmit={this.onConfirm}
                           onReview={this.onReview}
-                          onCancel={this.onCancel}
                           submitted={this.state.submitted}
                           unreviewed={this.state.unreviewed}
                           validated={this.state.validated}

diff --git a/web/src/containers/add.js b/web/src/containers/add.js
@@ -4,7 +4,6 @@ import Add from '../components/pages/add';
 
 import {
   submitSentences,
-  resetFullState,
 } from '../actions';
 
 import {
@@ -24,7 +23,6 @@ function mapDispatchToProps(dispatch) {
     submitSentences:
       (language, sentences, source) => dispatch(submitSentences(language, sentences, source)),
     parseSentences: (language, text) => dispatch(parseSentences(language, text)),
-    resetFullState: () => dispatch(resetFullState()),
   };
 }
 

diff --git a/web/src/reducers/index.js b/web/src/reducers/index.js
@@ -16,7 +16,6 @@ import {
   ACTION_SUBMIT_SENTENCES_REQUEST,
   ACTION_SUBMIT_SENTENCES_SUCCESS,
   ACTION_SUBMIT_SENTENCES_FAILURE_SINGLE,
-  ACTION_RESET_STATE,
 } from '../actions';
 
 import {
@@ -143,14 +142,6 @@ export default function reducer(state = INITIAL_STATE, action) {
         errorMessage: action.error.message,
       });
 
-    case ACTION_RESET_STATE:
-      return Object.assign({}, state, INITIAL_STATE, {
-        username: state.username,
-        password: state.password,
-        authed: state.authed,
-        languages: state.languages,
-      });
-
     default:
       return state;
   }