Set default extractor category to EXTRACT in both heartbeat and api.

Author: lmarini

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.7.4 - 2019-10-21
+
+### Fixed
+- Extractors that don't specify EXTRACT as categories don't show up in the manual submission page.
+  [CATS-1023](https://opensource.ncsa.illinois.edu/jira/browse/CATS-1023)
+
 ## 1.7.3 - 2019-08-19
 
 ### Fixed

app/api/Extractions.scala

@@ -455,13 +455,10 @@ class Extractions @Inject()(
       case _ => request.body
     }
 
-    // If extractor doesn't have categories specified, set a default
-    requestJson = requestJson \ "categories" match {
-      case cats: JsUndefined => requestJson.as[JsObject] ++ Json.obj("categories" ->  Json.arr(ExtractorCategory.EXTRACT.toString))
-      case _ => requestJson
-    }
-
+    // Validate document
     val extractionInfoResult = requestJson.validate[ExtractorInfo]
+
+    // Update database
     extractionInfoResult.fold(
       errors => {
         BadRequest(Json.obj("status" -> "KO", "message" -> JsError.toFlatJson(errors)))

app/models/Extraction.scala

@@ -132,7 +132,7 @@ object ExtractorInfo {
       (JsPath \ "libraries").read[List[String]].orElse(Reads.pure(List.empty)) and
       (JsPath \ "bibtex").read[List[String]].orElse(Reads.pure(List.empty)) and
       (JsPath \ "process").read[ExtractorProcessTriggers].orElse(Reads.pure(new ExtractorProcessTriggers())) and
-      (JsPath \ "categories").read[List[String]].orElse(Reads.pure(List.empty))
+      (JsPath \ "categories").read[List[String]].orElse(Reads.pure(List[String](ExtractorCategory.EXTRACT.toString)))
     )(ExtractorInfo.apply _)
 }
 

app/services/RabbitmqPlugin.scala

@@ -1207,8 +1207,12 @@ class ExtractorsHeartbeats(channel: Channel, queue: String) extends Actor {
       // TODO store running extractors ids
       val id = UUID((json \ "id").as[String])
       val queue = (json \ "queue").as[String]
-      val extractor_info = (json \ "extractor_info")
+      val extractor_info = json \ "extractor_info"
+
+      // Validate document
       val extractionInfoResult = extractor_info.validate[ExtractorInfo]
+
+      // Update database
       extractionInfoResult.fold(
         errors => {
           Logger.error("Received extractor heartbeat with bad format: " + extractor_info)

doc/src/sphinx/conf.py

@@ -20,7 +20,7 @@
 author = 'Luigi Marini'
 
 # The full version, including alpha/beta/rc tags
-release = '1.7.3'
+release = '1.7.4'
 
 
 # -- General configuration ---------------------------------------------------

project/Build.scala

@@ -13,7 +13,7 @@ import NativePackagerKeys._
 object ApplicationBuild extends Build {
 
   val appName = "clowder"
-  val version = "1.7.3"
+  val version = "1.7.4"
   val jvm = "1.7"
 
   def appVersion: String = {