Merge branch 'develop' into 232-upload-file-to-folder

Author: lmarini

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 
 ### Fixed
+- When uploading a file, it would ignore any extractors marked disabled at the space level. [#246](https://github.com/clowder-framework/clowder/issues/246)
 - Added index for comments, will speed up index creation
 
 ## 1.17.0 - 2021-04-29

app/services/ExtractorRoutingService.scala

@@ -75,7 +75,7 @@ class ExtractorRoutingService {
   private def getMatchingExtractors(extractorIds: List[String], operation: String, resourceType: ResourceType.Value): List[String] = {
     val extractorsService = DI.injector.getInstance(classOf[ExtractorService])
 
-    extractorsService.getEnabledExtractors().flatMap(exId =>
+    extractorIds.flatMap(exId =>
       extractorsService.getExtractorInfo(exId)).filter(exInfo =>
       resourceType match {
         case ResourceType.dataset =>