Fix validation, error messages

Author: bodom0015

app/api/Extractions.scala

@@ -17,7 +17,7 @@ import play.api.libs.json.Json._
 import play.api.libs.json._
 import play.api.libs.ws.{Response, WS}
 import play.api.libs.functional.syntax._
-import play.api.mvc.MultipartFormData
+import play.api.mvc.{Action, MultipartFormData, Result, SimpleResult}
 import services._
 
 import scala.collection.mutable.ListBuffer
@@ -678,23 +678,53 @@ class Extractions @Inject()(
     // Fetch parameters from request body
     val (name, category, assignedExtractors) = parseExtractorsLabel(request)
 
-    // Validate and create new label
-    validateExtractorsLabel(name, category, assignedExtractors)
-    val label = extractors.createExtractorsLabel(name, category, assignedExtractors)
+    // Validate that name is not empty
+    if (name.isEmpty) {
+      BadRequest("Label Name cannot be empty")
+    } else {
+      // Validate that name is unique
+      extractors.getExtractorsLabel(name) match {
+        case Some(lbl) => Conflict("Label name is already in use: " + lbl.name)
+        case None => {
+          // Create the new label
+          val label = extractors.createExtractorsLabel(name, category, assignedExtractors)
+          Ok(Json.toJson(label))
+        }
+      }
+
+    }
 
-    Ok(Json.toJson(label))
   }
 
   def updateExtractorsLabel(id: UUID) = ServerAdminAction(parse.json) { implicit request =>
     // Fetch parameters from request body
     val (name, category, assignedExtractors) = parseExtractorsLabel(request)
 
-    // Validate and perform update
-    validateExtractorsLabel(name, category, assignedExtractors)
-    val label = ExtractorsLabel(id, name, category, assignedExtractors)
-    val updatedLabel = extractors.updateExtractorsLabel(label)
-
-    Ok(Json.toJson(updatedLabel))
+    // Validate that name is not empty
+    if (name.isEmpty) {
+      BadRequest("Label Name cannot be empty")
+    } else {
+      // Validate that name is still unique
+      extractors.getExtractorsLabel(name) match {
+        case Some(lbl) => {
+          // Exclude current id (in case name hasn't changed)
+          if (lbl.id != id) {
+            Conflict("Label name is already in use: " + lbl.name)
+          } else {
+            // Update the label
+            val label = ExtractorsLabel(id, name, category, assignedExtractors)
+            val updatedLabel = extractors.updateExtractorsLabel(label)
+            Ok(Json.toJson(updatedLabel))
+          }
+        }
+        case None => {
+          // Update the label
+          val label = ExtractorsLabel(id, name, category, assignedExtractors)
+          val updatedLabel = extractors.updateExtractorsLabel(label)
+          Ok(Json.toJson(updatedLabel))
+        }
+      }
+    }
   }
 
   def deleteExtractorsLabel(id: UUID) = ServerAdminAction { implicit request =>
@@ -715,10 +745,4 @@ class Extractions @Inject()(
 
     (name, category, assignedExtractors)
   }
-
-  def validateExtractorsLabel(name: String, category: Option[String], assignedExtractors: List[String]): Unit = {
-    if (name.isEmpty) {
-      BadRequest("Label Name cannot be empty")
-    }
-  }
 }

app/services/ExtractorService.scala

@@ -45,6 +45,8 @@ trait ExtractorService {
 
   def listExtractorsLabels(): List[ExtractorsLabel]
 
+  def getExtractorsLabel(name: String): Option[ExtractorsLabel]
+  
   def getExtractorsLabel(id: UUID): Option[ExtractorsLabel]
 
   def createExtractorsLabel(name: String, category: Option[String], extractors: List[String]): ExtractorsLabel

app/services/mongodb/MongoDBExtractorService.scala

@@ -223,6 +223,10 @@ class MongoDBExtractorService extends ExtractorService {
     ExtractorsLabelDAO.findAll().toList
   }
 
+  def getExtractorsLabel(name: String): Option[ExtractorsLabel] = {
+    ExtractorsLabelDAO.findOne(MongoDBObject("name" -> name))
+  }
+
   def getExtractorsLabel(id: UUID): Option[ExtractorsLabel] = {
     ExtractorsLabelDAO.findOne(MongoDBObject("_id" -> new ObjectId(id.stringify)))
   }

app/views/updateExtractors.scala.html

@@ -45,7 +45,7 @@ <h1>Extractor Catalog</h1>
                                 <div class="btn-group" data-toggle="buttons">
                                 @for(label <- catLabels) {
                                     <label class="btn btn-primary active">
-                                        <input type="checkbox" autocomplete="off" checked> @label.name
+                                        <input id="[email protected]" class="label-checkbox" type="checkbox" autocomplete="off" checked> @label.name
                                     </label>
                                 }
                                 </div>
@@ -348,9 +348,20 @@ <h1>Extractor Catalog</h1>
         <script>
                 $('document').ready(function () {
                     var params = new URLSearchParams(window.location.search);
-                    var targetParameter = "processTriggerSearchFilter"
-                    if (params.has(targetParameter)) {
-                        document.getElementById(targetParameter).value = params.get(targetParameter);
+                    var processTriggerParam = "processTriggerSearchFilter"
+                    if (params.has(processTriggerParam)) {
+                        document.getElementById(processTriggerParam).value = params.get(processTriggerParam);
+                    }
+                    var labelsParam = "labelsFilter"
+                    if (params.has(labelsParam)) {
+                        // If we have a label param, uncheck all other labels
+                        var labelNames = params.get(labelsParam).split(',');
+                        if (labels => 1) { $('.label-checkbox').prop("checked", false); }
+
+                        // Check only the labels in the query string
+                        labelNames.forEach(function(labelName) {
+                            $('label-' + labelName).prop("checked", true);
+                        });
                     }
                 });
         </script>

public/javascripts/extractors/extractors.js

@@ -137,6 +137,10 @@ function saveExtractorsLabel(label) {
 
     request.fail(function (jqXHR, textStatus, errorThrown){
         console.error("The following error occured: " + textStatus, errorThrown);
+        var operation = label.id ? "update" : "create";
+        var specificError = jqXHR.responseText;
+        var msg = "Failed to " + operation + " label: " + specificError;
+        notify(msg, "error");
     });
 
     return request;
@@ -155,6 +159,9 @@ function deleteExtractorsLabel(id) {
 
     request.fail(function (jqXHR, textStatus, errorThrown){
         console.error("The following error occured: " + textStatus, errorThrown);
+        var specificError = jqXHR.responseText;
+        var msg = "Failed to delete label: " + specificError
+        notify(msg, "error");
     });
 
     return request;