clowder-framework · lmarini · Sep 17, 2021 · Aug 24, 2021 · Aug 31, 2021 · Sep 10, 2021
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+### Fixed
+- Typos "success" when returning status from API and "occurred" when logging to console.
+
 ### Added
 - Add "when" parameter in a few GET API endpoints to enable pagination [#266](https://github.com/clowder-framework/clowder/issues/266)
 
-
 ## 1.18.1 - 2021-08-16
 
 This release fixes a critical issue where invalid zip files could result in the files not being uploaded correctly. To check to see if you are affected, please use the following query:

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -34,6 +34,7 @@ Following is a list of contributors in alphabetical order:
 - Sandeep Puthanveetil Satheesan
 - Smruti Padhy
 - Theerasit Issaranon
+- Tim Yardley
 - Todd Nicholson
 - Varun Kethineedi
 - Ward Poelmans

diff --git a/app/api/Selected.scala b/app/api/Selected.scala
@@ -87,7 +87,7 @@ class Selected @Inject()(selections: SelectionService,
         selections.get(user.email.get).map(d => {
           selections.remove(d.id, user.email.get)
         })
-        Ok(toJson(Map("sucess"->"true")))
+        Ok(toJson(Map("success"->"true")))
       }
     }
   }
@@ -100,7 +100,7 @@ class Selected @Inject()(selections: SelectionService,
           datasets.removeDataset(d.id, Utils.baseUrl(request), request.apiKey, request.user)
           selections.remove(d.id, user.email.get)
         })
-        Ok(toJson(Map("sucess"->"true")))
+        Ok(toJson(Map("success"->"true")))
       }
     }
   }
@@ -189,7 +189,7 @@ class Selected @Inject()(selections: SelectionService,
           events.addObjectEvent(request.user, d.id, d.name, EventType.ADD_TAGS_DATASET.toString)
           datasets.index(d.id)
         })
-        Ok(toJson(Map("sucess"->"true")))
+        Ok(toJson(Map("success"->"true")))
       }
     }
   }

diff --git a/app/api/Sensors.scala b/app/api/Sensors.scala
@@ -5,7 +5,7 @@ import play.api.Play.current
 import services.PostgresPlugin
 
 /**
- * Metadata about sensors registered with the system. Datastreams can be associalted with sensors.
+ * Metadata about sensors registered with the system. Datastreams can be associated with sensors.
  */
 object Sensors extends Controller with ApiController {
 

diff --git a/app/assets/javascripts/select-bulk.js b/app/assets/javascripts/select-bulk.js
@@ -20,7 +20,7 @@ $(function() {
             });
 
             request.fail(function (jqXHR, textStatus, errorThrown){
-                console.error("The following error occured: "+ textStatus, errorThrown);
+                console.error("The following error occurred: "+ textStatus, errorThrown);
                 window.location = "../login"; // FIXME hardcoded
             });
 

diff --git a/app/assets/javascripts/select.js b/app/assets/javascripts/select.js
@@ -19,7 +19,7 @@ $(function() {
             });
 
             request.fail(function (jqXHR, textStatus, errorThrown){
-                console.error("The following error occured: "+ textStatus, errorThrown);
+                console.error("The following error occurred: "+ textStatus, errorThrown);
                 window.location = "../login"; // FIXME hardcoded
             });
 
@@ -40,7 +40,7 @@ $(function() {
             });
 
             request.fail(function (jqXHR, textStatus, errorThrown){
-                console.error("The following error occured: "+ textStatus, errorThrown);
+                console.error("The following error occurred: "+ textStatus, errorThrown);
                 window.location = "../login"; // FIXME hardcoded
             });
 

diff --git a/app/views/admin/customize.scala.html b/app/views/admin/customize.scala.html
@@ -130,7 +130,7 @@ <h1>Customize</h1>
                     });
                 });
             }).fail(function(jqXHR) {
-                console.error("The following error occured: " + jqXHR.responseText);
+                console.error("The following error occurred: " + jqXHR.responseText);
                 notify("The application preferences was not updated", "error");
             });
 

diff --git a/app/views/admin/tos.scala.html b/app/views/admin/tos.scala.html
@@ -54,7 +54,7 @@ <h1>Terms of Service</h1>
                 }).done(function() {
                     notify("The terms of service have been updated", "success");
                 }).fail(function(jqXHR) {
-                    console.error("The following error occured: " + jqXHR.responseText);
+                    console.error("The following error occurred: " + jqXHR.responseText);
                     notify("The terms of service are not updated", "error");
                 });
 

diff --git a/app/views/admin/users.scala.html b/app/views/admin/users.scala.html
@@ -212,7 +212,7 @@ <h4 class="panel-title">
                         users = { active: [], inactive: [], admin: [], unadmin: [] };
                         notify("Users successfully updated.", "success", false, 5000);
                     }).fail(function (jqXHR, textStatus, errorThrown){
-                        console.error("The following error occured: " + textStatus, errorThrown);
+                        console.error("The following error occurred: " + textStatus, errorThrown);
                         notify("Could not update users : " + errorThrown, "error");
                     });
                 } else {

diff --git a/app/views/bookmarklet.scala.html b/app/views/bookmarklet.scala.html
@@ -31,7 +31,7 @@
       var outstandingExtractions = new Array();
       var tags = {};
       var failedCountDown;
-      var sucessfullyDone;
+      var successfullyDone;
       var countDone;
       var status = '';
       var imgdocs = {};
@@ -352,7 +352,7 @@
         outstandingExtractions = new Array();
         tags = {};
         failedCountDown = 0;
-        sucessfullyDone = 0;
+        successfullyDone = 0;
         countDone = 0;
         status = '';
         imgdocs = {};
@@ -430,16 +430,16 @@
         // console.log("Checking submission status");
         countDone=0;
         failedCountDown=0;
-        sucessfullyDone=0;
+        successfullyDone=0;
 
         for ( var j = 0; j < filesInfo.length; j++) {
           if (filesInfo[j].status == 'Processing') {
             console.log('---[check Results]---status: Processing');
           } else if (filesInfo[j].status == 'Done') {
             countDone++;
             console.log('---countDone Incremented-- ');
-            sucessfullyDone++;
-            // jQuery('#DTSSuccessfulExtractions').text(sucessfullyDone);
+            successfullyDone++;
+            // jQuery('#DTSSuccessfulExtractions').text(successfullyDone);
           } else if (filesInfo[j].status == 'Required Extractor is either busy or is not currently running. Try after some time.') {
             console.log('---[check Results]---status: Required Extractor is either busy or is not currently running. Try after some time.');
           }
@@ -457,9 +457,9 @@
           }
         }
         // TODO update ui counts
-        jQuery('#DTSSuccessfulExtractions').text(sucessfullyDone);
+        jQuery('#DTSSuccessfulExtractions').text(successfullyDone);
         jQuery('#DTSFailedExtractions').text(failedCountDown);
-        console.log('Successfull: ' + sucessfullyDone);
+        console.log('Successfull: ' + successfullyDone);
         console.log('Failed: ' + failedCountDown);
         if (countDone > 0 && countDone == filesInfo.length) {
           status = 'Done';

diff --git a/app/views/collectionPreviews.scala.html b/app/views/collectionPreviews.scala.html
@@ -62,12 +62,12 @@ <h3>Previewers available for this collection</h3>
         });
 
         request.fail(function (jqXHR, textStatus, errorThrown){
-            console.error("The following error occured: " + textStatus, errorThrown);
+            console.error("The following error occurred: " + textStatus, errorThrown);
         });
     });
 
     request.fail(function (jqXHR, textStatus, errorThrown){
-        console.error("The following error occured: " + textStatus, errorThrown);
+        console.error("The following error occurred: " + textStatus, errorThrown);
     });
 
 

diff --git a/app/views/commentform.scala.html b/app/views/commentform.scala.html
@@ -182,7 +182,7 @@
     });
 
     request.fail(function(jqXHR, textStatus, errorThrown) {
-      console.error("The following error occured: " + textStatus, errorThrown);
+      console.error("The following error occurred: " + textStatus, errorThrown);
       var errMsg = "You must be logged in to post a comment.";
       if (!checkErrorAndRedirect(jqXHR, errMsg)) {
         notify("Error posting comment : " + errorThrown, "error");

diff --git a/app/views/dataset.scala.html b/app/views/dataset.scala.html
@@ -450,7 +450,7 @@ <h4>Statistics</h4>
             });
 
             request.fail(function (jqXHR, textStatus, errorThrown){
-                console.error("The following error occured: " + textStatus, errorThrown);
+                console.error("The following error occurred: " + textStatus, errorThrown);
                 notify("Failed to archive dataset.", "error");
             });
         }
@@ -466,7 +466,7 @@ <h4>Statistics</h4>
             });
 
             request.fail(function (jqXHR, textStatus, errorThrown){
-                console.error("The following error occured: " + textStatus, errorThrown);
+                console.error("The following error occurred: " + textStatus, errorThrown);
                 notify("Failed to unarchive dataset.", "error");
             });
         }
@@ -694,7 +694,7 @@ <h4>Statistics</h4>
 
                     request.fail(function (jqXHR, textStatus, errorThrown){
                         $('#name').val("");
-                        console.error("The following error occured: " + textStatus, errorThrown);
+                        console.error("The following error occurred: " + textStatus, errorThrown);
                         var errMsg = "You must be logged in to create a new folder.";
                         if (!checkErrorAndRedirect(jqXHR, errMsg)) {
                             notify("Error in creating folder: " + errorThrown, "error");

diff --git a/app/views/datasetInfo.scala.html b/app/views/datasetInfo.scala.html
@@ -23,7 +23,7 @@
 
      request.fail(function (jqXHR, textStatus, errorThrown){
         console.error(
-            "The following error occured: "+
+            "The following error occurred: "+
             textStatus, errorThrown
 
         );

diff --git a/app/views/datasets/create.scala.html b/app/views/datasets/create.scala.html
@@ -233,7 +233,7 @@ <h1>@Messages("create.header", Messages("dataset.title"))</h1>
                     });
 
                     request.fail(function (jqXHR, textStatus, errorThrown){
-                        console.error("The following error occured: " + textStatus, errorThrown);
+                        console.error("The following error occurred: " + textStatus, errorThrown);
                         var errMsg = "You must be logged in to create a new dataset.";
                         if (!checkErrorAndRedirect(jqXHR, errMsg)) {
                             notify("Error in creating dataset. : " + errorThrown, "error");

diff --git a/app/views/datasets/editInfo.scala.html b/app/views/datasets/editInfo.scala.html
@@ -99,7 +99,7 @@
     });
 
     request.fail(function (jqXHR, textStatus, errorThrown){
-        console.error("The following error occured: "+textStatus, errorThrown);
+        console.error("The following error occurred: "+textStatus, errorThrown);
         var errMsg = "You must be logged in to update the information about a dataset.";
         if (!checkErrorAndRedirect(jqXHR, errMsg)) {
             notify("The dataset information was not updated due to : " + errorThrown, "error");

diff --git a/app/views/datasets/filesAndFolders.scala.html b/app/views/datasets/filesAndFolders.scala.html
@@ -175,7 +175,7 @@
                     getUpdatedFilesAndFolders();
                 });
                 request.fail(function (jqXHR, textStatus, errorThrown){
-                    console.error("The following error occured: " + textStatus, errorThrown);
+                    console.error("The following error occurred: " + textStatus, errorThrown);
                     notify("Could not delete marked file "+selected[entry]+": " + errorThrown, "error");
                     // Add it back to selected list
                     addFileToMarked(selected[entry]);
@@ -263,7 +263,7 @@ <h4 class="modal-title">Tag All Marked Files</h4>
                         getUpdatedFilesAndFolders();
                     });
                     request.fail(function (jqXHR, textStatus, errorThrown) {
-                        console.error("The following error occured: " + textStatus, errorThrown);
+                        console.error("The following error occurred: " + textStatus, errorThrown);
                         notify("Could not tag marked file " + selected[entry] + ": " + errorThrown, "error");
                     });
                 }
@@ -282,7 +282,7 @@ <h4 class="modal-title">Tag All Marked Files</h4>
                 notify("Tag(s) successfully added.", "success", false, 2000);
             });
             request.fail(function (jqXHR, textStatus, errorThrown){
-                console.error("The following error occured: " + textStatus, errorThrown);
+                console.error("The following error occurred: " + textStatus, errorThrown);
                 notify("Could not tag selections: " + errorThrown, "error");
             });
 

diff --git a/app/views/datasets/tags.scala.html b/app/views/datasets/tags.scala.html
@@ -95,7 +95,7 @@ <h4>Tags</h4>
         });
 
         request.fail(function (jqXHR, textStatus, errorThrown) {
-            console.error("The following error occured: " + textStatus, errorThrown);
+            console.error("The following error occurred: " + textStatus, errorThrown);
             var errMsg = "You must be logged in to remove a tag from a dataset.";
             if (!checkErrorAndRedirect(jqXHR, errMsg)) {
                 notify("The tag was not removed from the dataset due to : " + errorThrown, "error");
@@ -150,7 +150,7 @@ <h4>Tags</h4>
                 });
 
                 request.fail(function (jqXHR, textStatus, errorThrown){
-                    console.error("The following error occured: "+textStatus, errorThrown);
+                    console.error("The following error occurred: "+textStatus, errorThrown);
                     var errMsg = "You must be logged in to add a tag to a dataset.";
                     if (!checkErrorAndRedirect(jqXHR, errMsg)) {
                         notify("The tag was not added to the dataset due to : " + errorThrown, "error");

diff --git a/app/views/datasetsContainingFile.scala.html b/app/views/datasetsContainingFile.scala.html
@@ -42,7 +42,7 @@
                 $(event.target.parentNode.parentNode).remove();
             });
             request.fail(function (jqXHR, textStatus, errorThrown){
-            	console.error("The following error occured: "+textStatus, errorThrown);
+            	console.error("The following error occurred: "+textStatus, errorThrown);
                 var errMsg = "You must be logged in to remove a file from a dataset.";                    
                 if (!checkErrorAndRedirect(jqXHR, errMsg)) {
                     notify("The file was not removed from the dataset due to : " + errorThrown, "error");

diff --git a/app/views/emailAdmin.scala.html b/app/views/emailAdmin.scala.html
@@ -59,7 +59,7 @@ <h1>Email admins</h1>
                     $("#subject").val('')
                     $("#body").val('')
                 }).fail(function (jqXHR, textStatus, errorThrown) {
-                    console.error("The following error occured: " + textStatus, errorThrown);
+                    console.error("The following error occurred: " + textStatus, errorThrown);
                     notify("The application preferences was not updated due to : " + errorThrown, "error", false);
                 });
                 return false;

diff --git a/app/views/errorPage.scala.html b/app/views/errorPage.scala.html
@@ -32,7 +32,7 @@ <h3>@re.toString()</h3>
                 });
 
                 request.fail(function (jqXHR, textStatus, errorThrown){
-                    console.error("The following error occured: " + textStatus, errorThrown);
+                    console.error("The following error occurred: " + textStatus, errorThrown);
                 });
             });
   </script>

diff --git a/app/views/extractions/submitDatasetExtraction.scala.html b/app/views/extractions/submitDatasetExtraction.scala.html
@@ -91,7 +91,7 @@ <h1>Submit dataset for extraction</h1>
             });
 
             request.fail(function (jqXHR, textStatus, errorThrown){
-                console.error("The following error occured: " + textStatus, errorThrown);
+                console.error("The following error occurred: " + textStatus, errorThrown);
             });
         }
     </script>

diff --git a/app/views/extractions/submitFileExtraction.scala.html b/app/views/extractions/submitFileExtraction.scala.html
@@ -130,7 +130,7 @@ <h1>Submit file for extraction</h1>
             });
 
             request.fail(function (jqXHR, textStatus, errorThrown){
-                console.error("The following error occured: " + textStatus, errorThrown);
+                console.error("The following error occurred: " + textStatus, errorThrown);
             });
         }
     </script>

diff --git a/app/views/extractions/submitSelectedExtraction.scala.html b/app/views/extractions/submitSelectedExtraction.scala.html
@@ -100,7 +100,7 @@ <h1>Submit marked files for extraction</h1>
             });
 
             request.fail(function (jqXHR, textStatus, errorThrown){
-                console.error("The following error occured: " + textStatus, errorThrown);
+                console.error("The following error occurred: " + textStatus, errorThrown);
             });
         }
 

diff --git a/app/views/file.scala.html b/app/views/file.scala.html
@@ -937,7 +937,7 @@ <h4>License</h4>
                         });
 
                         request.fail(function (jqXHR, textStatus, errorThrown){
-                            console.error("The following error occured: " + textStatus, errorThrown);
+                            console.error("The following error occurred: " + textStatus, errorThrown);
 							notify("Failed to archive file.", "error");
                         });
 
@@ -964,7 +964,7 @@ <h4>License</h4>
 						});
 
 						request.fail(function (jqXHR, textStatus, errorThrown){
-							console.error("The following error occured: " + textStatus, errorThrown);
+							console.error("The following error occurred: " + textStatus, errorThrown);
 							notify("Failed to unarchive file.", "error");
 						});
 
@@ -1152,7 +1152,7 @@ <h4>Tags</h4>
 							});
 
 							request.fail(function (jqXHR, textStatus, errorThrown){
-								console.error("The following error occured: " + textStatus, errorThrown);
+								console.error("The following error occurred: " + textStatus, errorThrown);
 								var errMsg = "You must be logged in to remove a tag from a file.";
 								if (!checkErrorAndRedirect(jqXHR, errMsg)) {
 									notify("The tag was not removed from the file due to : " + errorThrown, "error");
@@ -1185,7 +1185,7 @@ <h4>Tags</h4>
 							});
 
 							request.fail(function (jqXHR, textStatus, errorThrown){
-								console.error("The following error occured: " + textStatus, errorThrown);
+								console.error("The following error occurred: " + textStatus, errorThrown);
 								var errMsg = "You must be logged in to remove a tag from a file.";
 								if (!checkErrorAndRedirect(jqXHR, errMsg)) {
 									notify("The tag was not removed from the file due to : " + errorThrown, "error");
@@ -1249,7 +1249,7 @@ <h4>Tags</h4>
 									});
 
 									request.fail(function (jqXHR, textStatus, errorThrown){
-										console.error("The following error occured: " + textStatus, errorThrown);
+										console.error("The following error occurred: " + textStatus, errorThrown);
 										var errMsg = "You must be logged in to add a tag to a file.";
 										if (!checkErrorAndRedirect(jqXHR, errMsg)) {
 											notify("The tag was not added to the file due to : " + errorThrown, "error");

diff --git a/app/views/files/share.scala.html b/app/views/files/share.scala.html
@@ -50,7 +50,7 @@ <h1 id="file-name-title" class="inline  break-word"><span class="glyphicon glyph
             });
 
             request.fail(function (jqXHR, textStatus, errorThrown){
-                console.error("The following error occured: " + textStatus, errorThrown);
+                console.error("The following error occurred: " + textStatus, errorThrown);
                 var errMsg = "You must be logged in to remove a tag from a file.";
                 if (!checkErrorAndRedirect(jqXHR, errMsg)) {
                     notify("The tag was not removed from the file due to : " + errorThrown, "error");
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,7 +100,7 @@ <h1>Submit marked files for extraction</h1> @@
                 });
                 request.fail(function (jqXHR, textStatus, errorThrown){
-                    console.error("The following error occured: " + textStatus, errorThrown);
+                    console.error("The following error occurred: " + textStatus, errorThrown);
                 });
             }
@@ Expand Down @@