Merge branch 'master' into develop

# Conflicts:
#	CHANGELOG.md

Author: lmarini

CHANGELOG.md

@@ -25,6 +25,13 @@ of these changes a reindex of Elasticsearch is required. This can be started by
 - When adding tags to a section of an image, show the new tag without having to refresh the page.
   [CATS-1053](https://opensource.ncsa.illinois.edu/jira/browse/CATS-1053)
 
+## 1.8.4 - 2020-05-15
+**_Warning:_ This update modifies how information is stored in Elasticsearch for text based searching. To take advantage 
+of these changes a reindex of Elasticsearch is required. This can be started by an admin either from GUI or through the API.**
+
+### Fixed
+- Fixed a bug related to improper indexing of files in nested subfolders, which could also affect searching by parent dataset.
+
 ## 1.8.3 - 2020-04-28
 **_Warning:_ This update modifies how information is stored in Elasticsearch for text based searching. To take advantage 
 of these changes a reindex of Elasticsearch is required. This can be started by an admin either from GUI or through the API.**

app/services/ElasticsearchPlugin.scala

@@ -441,14 +441,8 @@ class ElasticsearchPlugin(application: Application) extends Plugin {
     // Perform recursion first if necessary
     if (recursive) {
       files.get(dataset.files).found.foreach(f => index(f, idx))
-      for (folderid <- dataset.folders) {
-        folders.get(folderid) match {
-          case Some(f) => {
-            files.get(f.files).found.foreach(fi => index(fi, idx))
-          }
-          case None => Logger.error(s"Error getting file $folderid for recursive indexing")
-        }
-      }
+      for (f <- folders.findByParentDatasetId(dataset.id))
+        files.get(f.files).found.foreach(fi => index(fi, idx))
     }
     index(SearchUtils.getElasticsearchObject(dataset), idx.getOrElse(nameOfIndex))
   }

app/util/SearchUtils.scala

@@ -26,20 +26,16 @@ object SearchUtils {
 
     // Get child_of relationships for File
     var child_of: ListBuffer[String] = ListBuffer()
-    datasets.findByFileIdDirectlyContain(id).map(ds => {
+    // ...first, the dataset which contains the file or its folder
+    datasets.findByFileIdAllContain(id).map(ds => {
       child_of += ds.id.toString
       ds.spaces.map(spid => child_of += spid.toString)
       ds.collections.map(collid => child_of += collid.toString)
     })
-    val folderlist = folders.findByFileId(id).map(fld => {
+    // ...second, the immediate parent folder ID (and the folder's parent) itself
+    folders.findByFileId(id).map(fld => {
       child_of += fld.id.toString
       child_of += fld.parentDatasetId.toString
-      fld.id
-    })
-    datasets.get(folderlist).found.foreach(ds => {
-      child_of += ds.id.toString
-      ds.spaces.map(spid => child_of += spid.toString)
-      ds.collections.map(collid => child_of += collid.toString)
     })
     val child_of_distinct = child_of.toList.distinct
 

doc/src/sphinx/conf.py

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

project/Build.scala

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