Fix grouped entities view

Author: PrinsINT

client/src/api/evaluation.ts

@@ -64,7 +64,7 @@ export function getMetrics(corpus: UUID, hypothesis: string, reference: string):
  * @param reference  Tagger job name as reference layer.
  */
 export function getDownloadEvaluation(corpus: UUID, hypothesis: string, reference: string): Promise<BlobResponse> {
-    return getBlob(downloadPath(corpus, hypothesis), { params: { reference } })
+    return getBlob(downloadPath(corpus), { params: { reference, hypothesis } })
 }
 
 /**

client/src/components/tables/CorpusTable.vue

@@ -41,7 +41,6 @@ const { loading, corpusId, corpus } = storeToRefs(stores.useCorpora())
 const selectedCorpus = computed<CorpusMetadata>({
     get: () => corpus.value,
     set: (value: CorpusMetadata) => {
-        console.log("Selected corpus", value)
         corpusId.value = value.uuid
     },
 })

client/src/components/tables/MetricsTable.vue

@@ -11,8 +11,8 @@
             <p>Generating metrics for large corpora may take a while...</p>
         </template>
 
-        <template #header>
-            <slot name="prepend"></slot>
+        <template #header v-else>
+            <slot name="header"></slot>
         </template>
 
         <template

client/src/components/tables/SingleTermComparisonTable.vue

@@ -9,10 +9,7 @@
 </template>
 
 <script setup lang="ts">
-// Libraries & stores
-
 import stores from "@/stores"
-// Types & API
 import type { Term } from "@/types/evaluation"
 import type { Column } from "@/types/ui/table"
 
@@ -71,7 +68,7 @@ function cleanAnnotation(term) {
     background-color: rgba(255, 0, 0, 0.1);
 }
 
-.termCompTable :deep(td) {
-    padding: 0 !important;
-}
+//.termCompTable :deep(td) {
+//    padding: 0 !important;
+//}
 </style>

client/src/views/annotate/subviews/evaluate/subviews/EntitiesView.vue

@@ -88,7 +88,6 @@ const entityOptions = computed(() => {
         // in which indices of entittyLegend does this label occur?
         const occurence = []
         for (const [i, job] of Object.keys(entities.value.jobs).entries()) {
-            console.log("job", job, "i", i)
             if (entities.value.jobs[job].summary[label] !== undefined) {
                 occurence.push(i + 1) // +1 because we want to start from 1, not 0
             }

client/src/views/annotate/subviews/evaluate/subviews/GroupedMetricsView.vue

@@ -16,10 +16,11 @@
                 </p>
             </template>
             <template #header v-if="metrics.metrics != null">
+                <GSelect :options="groupingOptions" v-model="selectedGrouping" />
                 <p>
                     <b> Only the 100 most frequent groups are shown. </b>
                 </p>
-                <MetricsFilter ref="metricsFilter" :annotations="metrics.metrics" />
+                <!-- <MetricsFilter ref="metricsFilter" :annotations="metrics.metrics" /> -->
             </template>
         </MetricsTable>
     </div>
@@ -42,6 +43,10 @@ const jobSelection = stores.useJobSelection()
 
 // Fields
 const downloading = ref<boolean>()
+const selectedGrouping = ref<string>("lemmaByLemma")
+const groupingOptions = computed(() =>
+    Object.keys(metrics.value?.metrics || {}).map((key) => ({ value: key, text: key })),
+)
 
 const columns = computed(() => metricsPerPosColumns)
 const metricsFilter = useTemplateRef<InstanceType<typeof MetricsFilter>>("metricsFilter")
@@ -50,13 +55,13 @@ const metricName = computed(() => {
 })
 
 const posMetrics = computed(() => {
-    if (metrics.value?.metrics?.[metricName.value] == null) return []
+    if (metrics.value?.metrics?.[selectedGrouping.value] == null) return []
     // Copy over the metrics (depending on selectedMetric.value) from:
     // { ADJ: { ADJ: { pos : { f1, recall, ... }, lemma : { f1, recall, ... } } } } }
     // to:
     // { ADJ: { ADJ: { f1, recall, ..., } } }
-    const ret = metrics.value.metrics[metricName.value].grouped.map((i) => ({
-        column: metricName.value.split("By")[1].toLowerCase(),
+    const ret = metrics.value.metrics[selectedGrouping.value].grouped.map((i) => ({
+        column: selectedGrouping.value.split("By")[1].toLowerCase(),
         name: i.name,
         count: i.classes.classCount,
         truePositive: i.classes.truePositive,