#2447: data_append.jsx, implement ajax spinner

Author: jeff1evesque

src/jsx/import/session-type/data_append.jsx

@@ -14,6 +14,7 @@ import SupplyDatasetFile from '../input-data/supply_dataset_file.jsx';
 import SupplyDatasetUrl from '../input-data/supply_dataset_url.jsx';
 import checkValidString from './../validator/valid_string.js';
 import checkValidInt from './../validator/valid_int.js';
+import Spinner from './../general/spinner.jsx';
 
 var DataAppend = React.createClass({
   // initial 'state properties'
@@ -76,6 +77,13 @@ var DataAppend = React.createClass({
         var Dataset = this.getSupplyDataset(inputDatasetType, inputSessionId);
         var options = this.state.ajax_done_options;
 
+        if (this.state.display_spinner) {
+            var AjaxSpinner = Spinner;
+        }
+        else {
+            var AjaxSpinner = 'span';
+        }
+
         return(
             <fieldset className='fieldset-session-data-upload'>
                 <legend>Data Upload</legend>
@@ -115,6 +123,8 @@ var DataAppend = React.createClass({
                 </fieldset>
 
                 <Dataset onChange={this.displaySubmit}/>
+
+                <AjaxSpinner />
             </fieldset>
         );
     },
@@ -142,6 +152,9 @@ var DataAppend = React.createClass({
             'data': null
         };
 
+      // boolean to show ajax spinner
+        this.setState({display_spinner: true});
+
       // asynchronous callback: ajax 'done' promise
         if (this.mounted) {
             ajaxCaller(function (asynchObject) {
@@ -151,6 +164,8 @@ var DataAppend = React.createClass({
                 } else if (asynchObject) {
                     this.setState({ajax_done_options: asynchObject});
                 }
+            // boolean to hide ajax spinner
+                this.setState({display_spinner: false});
             }.bind(this),
           // asynchronous callback: ajax 'fail' promise
             function (asynchStatus, asynchError) {
@@ -162,6 +177,8 @@ var DataAppend = React.createClass({
                     this.setState({ajax_fail_error: asynchError});
                     console.log('Error Thrown: ' + asynchError);
                 }
+            // boolean to hide ajax spinner
+                this.setState({display_spinner: false});
             }.bind(this),
           // pass ajax arguments
             ajaxArguments);