editor can now successfully delete tags (#144)

* editor can now successfully delete tags

* changelog

* Removed unused method parameters when removing tags. Also fixed removing tags for sections so that space editors can remove those as well.

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

Author: tcnichol

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - GeospatialViewer preview tab should no longer show if it does not contain any rendered data.
+- Editor can now delete tags on files, datasets and sections.
 - An extractor with file matching set to `*/*` (all file types) would mistakenly send out dataset events.
 
 ## 1.12.2 - 2020-11-19

app/api/Datasets.scala

@@ -1395,18 +1395,16 @@ class  Datasets @Inject()(
 
     val error_str = tagCheck.error_str
     val not_found = tagCheck.not_found
-    val userOpt = tagCheck.userOpt
-    val extractorOpt = tagCheck.extractorOpt
     val tags = tagCheck.tags
 
     // Now the real work: removing the tags.
     if ("" == error_str) {
       // Clean up leading, trailing and multiple contiguous white spaces.
       val tagsCleaned = tags.get.map(_.trim().replaceAll("\\s+", " "))
       (obj_type) match {
-        case TagCheck_File => files.removeTags(id, userOpt, extractorOpt, tagsCleaned)
+        case TagCheck_File => files.removeTags(id, tagsCleaned)
         case TagCheck_Dataset => {
-          datasets.removeTags(id, userOpt, extractorOpt, tagsCleaned)
+          datasets.removeTags(id, tagsCleaned)
           datasets.get(id) match {
             case Some(dataset) => {
               events.addObjectEvent(request.user, id, dataset.name, EventType.REMOVE_TAGS_DATASET.toString)
@@ -1416,7 +1414,7 @@ class  Datasets @Inject()(
 
         }
 
-        case TagCheck_Section => sections.removeTags(id, userOpt, extractorOpt, tagsCleaned)
+        case TagCheck_Section => sections.removeTags(id, tagsCleaned)
       }
       Ok(Json.obj("status" -> "success"))
     } else {

app/services/DatasetService.scala

@@ -253,7 +253,7 @@ trait DatasetService {
   /** Queue a dataset to be indexed in Elasticsearch. */
   def index(id: UUID, idx: Option[String] = None)
 
-  def removeTags(id: UUID, userIdStr: Option[String], eid: Option[String], tags: List[String])
+  def removeTags(id: UUID, tags: List[String])
 
   def removeTag(id: UUID, tagId: UUID)
 

app/services/FileService.scala

@@ -153,7 +153,7 @@ trait FileService {
 
   def isInDataset(file: File, dataset: Dataset): Boolean
 
-  def removeTags(id: UUID, userIdStr: Option[String], eid: Option[String], tags: List[String])
+  def removeTags(id: UUID, tags: List[String])
 
   def addMetadata(fileId: UUID, metadata: JsValue)
 

app/services/SectionService.scala

@@ -18,7 +18,7 @@ trait SectionService {
 
   def addTags(id: UUID, userIdStr: Option[String], eid: Option[String], tags: List[String]) : List[Tag]
 
-  def removeTags(id: UUID, userIdStr: Option[String], eid: Option[String], tags: List[String])
+  def removeTags(id: UUID, tags: List[String])
 
   def findByFileId(fileId: UUID): List[Section]
 

app/services/mongodb/MongoDBDatasetService.scala

@@ -1072,10 +1072,10 @@ class MongoDBDatasetService @Inject() (
     val result = Dataset.update(MongoDBObject("_id" -> new ObjectId(id.stringify)), $pull("tags" -> MongoDBObject("_id" -> new ObjectId(tagId.stringify))), false, false, WriteConcern.Safe)
   }
 
-  def removeTags(id: UUID, userIdStr: Option[String], eid: Option[String], tags: List[String]) {
-    Logger.debug("Removing tags in dataset " + id + " : " + tags + ", userId: " + userIdStr + ", eid: " + eid)
+  def removeTags(id: UUID, tags: List[String]) {
+    Logger.debug("Removing tags in dataset " + id + " : " + tags )
     val dataset = get(id).get
-    val existingTags = dataset.tags.filter(x => userIdStr == x.userId && eid == x.extractor_id).map(_.name)
+    val existingTags = dataset.tags.map(_.name)
     Logger.debug("existingTags before user and extractor filtering: " + existingTags.toString)
     // Only remove existing tags.
     tags.intersect(existingTags).map {

app/services/mongodb/MongoDBFileService.scala

@@ -519,10 +519,10 @@ class MongoDBFileService @Inject() (
     }
   }
 
-  def removeTags(id: UUID, userIdStr: Option[String], eid: Option[String], tags: List[String]) {
-    Logger.debug("Removing tags in file " + id + " : " + tags + ", userId: " + userIdStr + ", eid: " + eid)
+  def removeTags(id: UUID, tags: List[String]) {
+    Logger.debug("Removing tags in file " + id + " : " + tags)
     val file = get(id).get
-    val existingTags = file.tags.filter(x => userIdStr == x.userId && eid == x.extractor_id).map(_.name)
+    val existingTags = file.tags.map(_.name)
     Logger.debug("existingTags after user and extractor filtering: " + existingTags.toString)
     // Only remove existing tags.
     tags.intersect(existingTags).map {

app/services/mongodb/MongoDBSectionService.scala

@@ -52,10 +52,10 @@ class MongoDBSectionService @Inject() (comments: CommentService, previews: Previ
     tagsAdded.toList
   }
 
-  def removeTags(id: UUID, userIdStr: Option[String], eid: Option[String], tags: List[String]) {
-    Logger.debug("Removing tags in section " + id + " : " + tags + ", userId: " + userIdStr + ", eid: " + eid)
+  def removeTags(id: UUID, tags: List[String]) {
+    Logger.debug("Removing tags in section " + id + " : " + tags)
     val section = SectionDAO.findOneById(new ObjectId(id.stringify)).get
-    val existingTags = section.tags.filter(x => userIdStr == x.userId && eid == x.extractor_id).map(_.id.toString())
+    val existingTags = section.tags.map(_.id.toString())
     Logger.debug("existingTags after user and extractor filtering: " + existingTags.toString)
     // Only remove existing tags.
     tags.intersect(existingTags).map { tag =>

app/services/mongodb/MongoDBTagService.scala

@@ -149,18 +149,16 @@ class MongoDBTagService @Inject()(files: FileService, datasets: DatasetService,
 
     val error_str = tagCheck.error_str
     val not_found = tagCheck.not_found
-    val userOpt = tagCheck.userOpt
-    val extractorOpt = tagCheck.extractorOpt
     val tags = tagCheck.tags
 
     // Now the real work: removing the tags.
     if ("" == error_str) {
       // Clean up leading, trailing and multiple contiguous white spaces.
       val tagsCleaned = tags.get.map(_.trim().replaceAll("\\s+", " "))
       (obj_type) match {
-        case TagCheck_File => files.removeTags(id, userOpt, extractorOpt, tagsCleaned)
-        case TagCheck_Dataset => datasets.removeTags(id, userOpt, extractorOpt, tagsCleaned)
-        case TagCheck_Section => sections.removeTags(id, userOpt, extractorOpt, tagsCleaned)
+        case TagCheck_File => files.removeTags(id, tagsCleaned)
+        case TagCheck_Dataset => datasets.removeTags(id, tagsCleaned)
+        case TagCheck_Section => sections.removeTags(id, tagsCleaned)
       }
     }
     (not_found, error_str)