fix typos (#269)

* fix typos

* Added changelog entry and Tim Yardley to CONTRIBUTORS.md.

Co-authored-by: Tim Yardley <[email protected]>
Co-authored-by: Luigi Marini <[email protected]>
Co-authored-by: Luigi Marini <[email protected]>

Author: 3 people

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:

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

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")))
       }
     }
   }

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 {
 

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
             });
 

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
             });
 

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");
             });
 

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");
                 });
 

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 {

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';