Merge branch 'develop' into bugfix/CATS-1053-tags-added-to-sections-do-not-appear-until-refresh

# Conflicts:
#	CHANGELOG.md

Author: lmarini

CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+### Added
+- Added aility to delete extractor, both from api and GUI.
+  [CATS-1044](https://opensource.ncsa.illinois.edu/jira/browse/CATS-1044)
+
 ### Fixed
 - Ability to delete tags on file page.
   [CATS-1042](https://opensource.ncsa.illinois.edu/jira/browse/CATS-1042)

app/api/Extractions.scala

@@ -448,6 +448,11 @@ class Extractions @Inject()(
     }
   }
 
+  def deleteExtractor(extractorName: String) = ServerAdminAction { implicit request =>
+    extractors.deleteExtractor(extractorName)
+    Ok(toJson(Map("status" -> "success")))
+  }
+
   def addExtractorInfo() = AuthenticatedAction(parse.json) { implicit request =>
 
     // If repository is of type object, change it into an array.

app/controllers/Application.scala

@@ -486,6 +486,7 @@ class Application @Inject() (files: FileService, collections: CollectionService,
         api.routes.javascript.Extractions.submitDatasetToExtractor,
         api.routes.javascript.Extractions.cancelFileExtractionSubmission,
         api.routes.javascript.Extractions.cancelDatasetExtractionSubmission,
+        api.routes.javascript.Extractions.deleteExtractor,
         api.routes.javascript.Folders.createFolder,
         api.routes.javascript.Folders.deleteFolder,
         api.routes.javascript.Folders.updateFolderName,
@@ -512,6 +513,7 @@ class Application @Inject() (files: FileService, collections: CollectionService,
         controllers.routes.javascript.Collections.newCollection,
         controllers.routes.javascript.Collections.newCollectionWithParent,
         controllers.routes.javascript.Spaces.stagingArea,
+        controllers.routes.javascript.Extractors.selectExtractors,
         controllers.routes.javascript.CurationObjects.submit,
         controllers.routes.javascript.CurationObjects.getCurationObject,
         controllers.routes.javascript.CurationObjects.getUpdatedFilesAndFolders,

app/services/ExtractorService.scala

@@ -40,4 +40,6 @@ trait ExtractorService {
   def getExtractorInfo(extractorName: String): Option[ExtractorInfo]
 
   def updateExtractorInfo(e: ExtractorInfo): Option[ExtractorInfo]
+
+  def deleteExtractor(extractorName: String)
 }

app/services/mongodb/MongoDBExtractorService.scala

@@ -204,6 +204,18 @@ class MongoDBExtractorService extends ExtractorService {
       }
     }
   }
+
+  def deleteExtractor(extractorName: String) {
+    ExtractorInfoDAO.findOne(MongoDBObject("name" -> extractorName)) match {
+      case Some(extractor) => {
+        ExtractorInfoDAO.remove(MongoDBObject("name" -> extractor.name))
+      }
+      case None => {
+        Logger.info("No extractor found with name: " + extractorName)
+      }
+
+    }
+  }
 }
 
 object ExtractorServer extends ModelCompanion[ExtractorServer, ObjectId] {

app/views/extractorDetails.scala.html

@@ -1,6 +1,8 @@
 @(extractor: ExtractorInfo)(implicit user: Option[models.User])
 
 @main("Extractor Details") {
+    <script src="@routes.Assets.at("javascripts/deleteUtils.js")" type="text/javascript"></script>
+    <script src="@routes.Assets.at("javascripts/extractors/extractors.js")" type="text/javascript"></script>
     <style>
         strong        { text-align: right; }
         fieldset      { margin-top: 5px; }
@@ -176,6 +178,7 @@
             <div class="col-sm-12">
                 <!-- "Back" button -->
                 <a class="btn btn-default" onclick="window.history.back()"><span class="glyphicon glyphicon-chevron-left" ></span> Back</a>
+                <a class="btn btn-danger" onclick="confirmDeleteResource('extractor','extractor','@(extractor.name)','@(extractor.name.replace("'","&#39;"))', true, '@(routes.Extractors.selectExtractors())')">Delete</a>
             </div>
         </div>
     </div>

conf/routes

@@ -429,8 +429,10 @@ GET            /api/extractions/:id/status
 GET            /api/extractions/:id/metadata                                            @api.Extractions.fetch(id:UUID)
 GET            /api/extractions/:id/statuses                                            @api.Extractions.checkExtractionsStatuses(id:UUID)
 
+DELETE         /api/extractions/:extractorName/delete                                   @api.Extractions.deleteExtractor(extractorName : String)
+
 DELETE         /api/files/:file_id/extractions/:msg_id                                  @api.Extractions.cancelFileExtractionSubmission(file_id:UUID, msg_id: UUID)
-DELETE         /api/datasets/:ds_id/extractions/:msg_id                               @api.Extractions.cancelDatasetExtractionSubmission(ds_id:UUID, msg_id: UUID)
+DELETE         /api/datasets/:ds_id/extractions/:msg_id                                 @api.Extractions.cancelDatasetExtractionSubmission(ds_id:UUID, msg_id: UUID)
 
 # End of change segment
 

public/javascripts/deleteUtils.js

@@ -143,6 +143,9 @@ function DeleteTemplate(resourceType, resourceId, isreload, url, resourceFromTyp
     } else if(resourceType == "curation folder" ) {
         //no redirect provided
         removeCurationFolder(resourceId, isreload, url);
+    } else if(resourceType == "extractor") {
+        //redirect to extractors
+        removeExtractor(resourceId)
     }
 }
 

public/javascripts/extractors/extractors.js

@@ -0,0 +1,21 @@
+function removeExtractor(extractorName){
+
+    console.log('removing extractor', extractorName);
+
+    var request = jsRoutes.api.Extractions.deleteExtractor(extractorName).ajax({
+        type: 'DELETE'
+    });
+
+    request.done(function (response, textStatus, jqXHR){
+        var url = jsRoutes.controllers.Extractors.selectExtractors().url;
+        window.location.href=url;
+    });
+
+    request.fail(function (jqXHR, textStatus, errorThrown){
+        console.error("The following error occurred: " + textStatus, errorThrown);
+        var errMsg = "Something went wrong deleting extractor.";
+        if (!checkErrorAndRedirect(jqXHR, errMsg)) {
+            notify("The extractor was not deleted from the system due to : " + errorThrown, "error");
+        }
+    });
+}