Use zip name when uploading hybrid/volume/collection

CHANGELOG.md

@@ -13,7 +13,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).
 -
 
 ### Changed
--
+- When uploading a zipped annotation (such as volume / hybrid / collection), the zip name is used for the resulting explorative annotation, rather than the name of the contained NML file. [#4222](https://github.com/scalableminds/webknossos/pull/4222)
 
 ### Fixed
 - Data for disabled or invisible layers will no longer be downloaded, saving bandwidth and speeding up webKnossos in general. [#4202](https://github.com/scalableminds/webknossos/pull/4202)

app/controllers/AnnotationIOController.scala

@@ -58,7 +58,7 @@ class AnnotationIOController @Inject()(nmlWriter: NmlWriter,
 
   private def nameForNmls(fileNames: Seq[String]) =
     if (fileNames.size == 1)
-      fileNames.headOption.map(_.replaceAll("\\.nml$", ""))
+      fileNames.headOption.map(_.replaceAll("\\.nml$", "").replaceAll("\\.zip", ""))
     else
       None
 
@@ -99,10 +99,9 @@ class AnnotationIOController @Inject()(nmlWriter: NmlWriter,
         request.body.dataParts("createGroupForEachFile").headOption.contains("true")
 
       val parsedFiles = request.body.files.foldLeft(NmlResults.ZipParseResult()) {
-        case (acc, next) => {
+        case (acc, next) =>
           val file = new File(next.ref.path.toString)
           acc.combineWith(nmlService.extractFromFile(file, next.filename))
-        }
       }
 
       val tracingsProcessed =

app/models/annotation/nml/NmlResults.scala

@@ -29,6 +29,8 @@ object NmlResults extends LazyLogging {
       case _ =>
         Fox.failure("Couldn’t parse file")
     }
+
+    def withName(name: String): NmlParseResult = this
   }
 
   case class NmlParseSuccess(fileName: String,
@@ -44,6 +46,8 @@ object NmlResults extends LazyLogging {
     override def description = Some(_description)
 
     override def organizationName: Option[String] = organizationNameOpt
+
+    override def withName(name: String): NmlParseResult = this.copy(fileName = name)
   }
 
   case class NmlParseFailure(fileName: String, error: String) extends NmlParseResult {

app/models/annotation/nml/NmlService.scala

@@ -42,7 +42,7 @@ class NmlService @Inject()(temporaryFileCreator: TemporaryFileCreator)(implicit
     ZipIO.withUnziped(file, includeHiddenFiles = false) { (filename, file) =>
       if (filename.toString.endsWith(".nml")) {
         val result = extractFromNml(file, filename.toString)
-        parseResults ::= result
+        parseResults ::= result.withName(name)
       } else {
         val tempFile = temporaryFileCreator.create(filename.toString)
         Files.copy(file, tempFile.path, StandardCopyOption.REPLACE_EXISTING)