Show jobs table again

Author: PrinsINT

client/src/views/annotate/subviews/JobsView.vue

@@ -38,7 +38,7 @@
             <!-- result summary cell -->
             <template #cell-resultSummary="d">
                 <!-- <span v-for="key in Object.keys(d.value)" :key="key"><span :key="key" v-if="d.value[key] > 0">{{ key }}: {{ d.value[key] }}, </span></span> -->
-                {{ d.value.numTokens }}
+                {{ d.value.tokens }}
             </template>
 
             <!-- era cell -->
@@ -61,7 +61,7 @@
             <template #cell-progress="d">
                 <span>
                     <!-- note that percentage is calculated based on num documents, ie not very accurate -->
-                    {{ d.item.progress.total === 0 ? '' : formatProgress(d.item.progress) }}
+                    {{ d.item.progress.total === 0 ? '0%' : formatProgress(d.item.progress) }}
                     <span v-if="d.item.progress.hasError" style="color: var(--int-red)">error !!</span>
                 </span>
                 <GSpinner class="spinner" small v-show="d.item.progress.busy" />

server/src/main/kotlin/org/ivdnt/galahad/documents/Document.kt

@@ -15,7 +15,6 @@ import java.io.File
  * Use [Document.create] instead.
  *
  * A folder has the following files, that store the document's data:
- * - plaintext.txt: the document's text content
  * - metadata.json: a cache file storing [DocumentMetadata] about the document
  * - uploaded/[name]: the uploaded raw file
  */
@@ -60,7 +59,6 @@ class Document(
             ThreadPoolUtil.pool.execute {
                 file.copyTo(doc.uploadedFile, overwrite = true)
             }
-            // plaintext & sourceLayer
             val internalFile = InternalFile.create(file)
             // First try to access the layer. If the file is invalid, this will throw.
             val sourceLayer = internalFile.layer

server/src/main/kotlin/org/ivdnt/galahad/jobs/Jobs.kt

@@ -1,5 +1,7 @@
 package org.ivdnt.galahad.jobs
 
+import org.ivdnt.galahad.annotations.LayerPreview
+import org.ivdnt.galahad.annotations.LayerSummary
 import org.ivdnt.galahad.annotations.SOURCE_LAYER_NAME
 import org.ivdnt.galahad.corpora.Corpus
 import org.ivdnt.galahad.exceptions.JobNotFoundException
@@ -37,10 +39,21 @@ class Jobs(
         // Safe to create it now
         return ctor(key)
     }
+
     override fun ctor(key: String): Job = Job(dir.resolve(key), corpus)
     override fun throwNotFound(key: String): Nothing = throw JobNotFoundException(key)
     override fun deleteOrThrow(key: String) {
         JobController.unqueue(readOrThrow(key))
         super.deleteOrThrow(key)
     }
+
+    fun readAllMetadata(): List<JobMetadata> {
+        // Create a map of all taggers with empty metadata
+        val allJobs = Tagger.taggers.mapValues {
+            JobMetadata(it.value, Progress(), LayerPreview(emptyList()), LayerSummary(0), 0)
+        }
+        // replace the entries for which a job exists
+        val jobs = readAll().map { it.metadata }.associateBy { it.tagger.id }
+        return (allJobs + jobs).values.toList()
+    }
 }

server/src/main/kotlin/org/ivdnt/galahad/web/controller/JobsController.kt

@@ -47,8 +47,7 @@ class JobsController(
     @GetMapping(JOBS_URL)
     fun getJobs(
         @PathVariable @Parameter(description = "Corpus UUID") corpus: UUID,
-        @RequestParam(defaultValue = "true") @Parameter(description = "Only show jobs that have a result. Otherwise also shows potential jobs.") hasResult: Boolean = true,
-    ): List<JobMetadata> = corpus.readJobs().readAll().map { it.metadata }.toList()
+    ): List<JobMetadata> = corpus.readJobs().readAllMetadata()
 
     @Operation(
         summary = "Get single job metadata",