Merge pull request #528 from pierotofy/browser

Browser fixes, better messages

app/static/app/js/components/NewTaskPanel.jsx

@@ -123,7 +123,7 @@ class NewTaskPanel extends React.Component {
             <div className="form-group">
               <div className="col-sm-offset-2 col-sm-10 text-right">
                 {this.props.onCancel !== undefined && <button type="submit" className="btn btn-danger" onClick={this.cancel} style={{marginRight: 4}}><i className="glyphicon glyphicon-remove-circle"></i> Cancel</button>}
-                <button type="submit" className="btn btn-primary" onClick={this.save}><i className="glyphicon glyphicon-saved"></i> Start Processing</button>
+                <button type="submit" className="btn btn-primary" onClick={this.save} disabled={this.props.filesCount <= 1}><i className="glyphicon glyphicon-saved"></i> Start Processing</button>
               </div>
             </div>
             : ""}

app/static/app/js/components/ProjectListItem.jsx

@@ -180,7 +180,8 @@ class ProjectListItem extends React.Component {
         })
         .on("completemultiple", (files) => {
           // Check
-          let success = files.length > 0 && files.filter(file => file.status !== "success").length === 0;
+          const invalidFilesCount = files.filter(file => file.status !== "success").length;
+          let success = files.length > 0 && invalidFilesCount === 0;
 
           // All files have uploaded!
           if (success){
@@ -201,8 +202,9 @@ class ProjectListItem extends React.Component {
             }
           }else{
             this.setUploadState({
+              totalCount: this.state.upload.totalCount - invalidFilesCount,
               uploading: false,
-              error: "Could not upload all files. An error occurred. Please try again."
+              error: `${invalidFilesCount} files cannot be uploaded. As a reminder, only images (.jpg, .png) and GCP files (.txt) can be uploaded. Try again.`
             });
           }
         })

app/static/app/js/components/TaskListItem.jsx

@@ -227,6 +227,7 @@ class TaskListItem extends React.Component {
           line.indexOf("MemoryError") !== -1 || 
           line.indexOf("std::bad_alloc") !== -1 ||
           line.indexOf("Child returned 137") !== -1 ||
+          line.indexOf("loky.process_executor.TerminatedWorkerError:") !== -1 ||
           line.indexOf("Failed to allocate memory") !== -1){
         this.setState({memoryError: true});
       }else if (line.indexOf("SVD did not converge") !== -1){

app/templates/app/base.html

@@ -17,6 +17,7 @@
     {% block extra-headers %}{% endblock %}
 
     <script src="{% static 'app/js/vendor/modernizr-2.8.3.min.js' %}"></script>
+    <script src="{% static 'app/js/vendor/es6-shim.min.js' %}"></script>
     <script src="{% static 'app/js/vendor/jquery-1.11.2.min.js' %}"></script>
     <script src="{% static 'app/js/vendor/system.js' %}"></script>
 

devenv.sh

@@ -14,6 +14,7 @@ usage(){
   echo "Command list:"
   echo "	start			Start the development environment"
   echo "	stop			Stop the development environment"
+  echo "	down			Tear down the development environment"
   echo "	runtests		Run unit tests"
   exit
 }
@@ -31,6 +32,10 @@ stop(){
 	run "${__dirname}/webodm.sh stop"
 }
 
+down(){
+	run "${__dirname}/webodm.sh down"
+}
+
 runtests(){
 	run "docker-compose exec webapp /bin/bash -c \"/webodm/webodm.sh test\""
 }
@@ -41,6 +46,9 @@ if [[ $1 = "start" ]]; then
 elif [[ $1 = "stop" ]]; then
 	echo "Stopping development environment..."
 	stop
+elif [[ $1 = "down" ]]; then
+	echo "Tearing down development environment..."
+	down
 elif [[ $1 = "runtests" ]]; then
 	echo "Starting tests..."
 	runtests "$2"