Experiment with stax

Author: PrinsINT

client/index.html

@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=0.8">
   <link rel="icon" href="/favicon.ico">
   <link rel="stylesheet" href="/font-awesome/css/font-awesome.min.css">
-  <script defer data-domain="portal.clarin.ivdnt.org/galahad" src="https://statistiek.ivdnt.org/js/script.js"></script>
+  <script defer data-domain="galahad.ivdnt.org" src="https://statistiek.ivdnt.org/js/script.js"></script>
   <title>GaLAHaD</title>
 </head>
 

client/src/components/input/FileFormatInput.vue

@@ -25,7 +25,7 @@ const options = [
     { value: Format.Tsv, text: "TSV (Tab-separated values)" },
 ]
 // Admins can also export txt.
-if (userStore.user.admin) {
+if (userStore.user.isAdmin) {
     // This exports the plain text, not the annotations.
     options.push({ value: Format.Txt, text: "TXT (Plain text)" })
 }

client/src/components/modals/corpus/CorpusForm.vue

@@ -47,7 +47,7 @@
                     </td>
                 </tr>
 
-                <template v-if="userStore.user.admin">
+                <template v-if="userStore.user.isAdmin">
                     <tr>
                         <td colspan="2">
                             <hr>

client/src/components/tables/CorpusTable.vue

@@ -26,7 +26,7 @@
 
         <template #prepend>
             <div style="display: flex; align-items: center; justify-content: center; margin-bottom:1em"
-                v-if="userStore.user.admin || type != TableCorporaType.Dataset">
+                v-if="userStore.user.isAdmin || type != TableCorporaType.Dataset">
                 <GButton green @click="$emit('create')" v-if="type == TableCorporaType.User">
                     New
                 </GButton>

client/src/components/tables/DocumentsTable.vue

@@ -44,17 +44,14 @@
                 {{ data.value }}
             </template>
 
-            <template #head-layerSummary>
-                annotation
-            </template>
             <!-- layerSummary cell -->
             <template #cell-layerSummary="data">
                 <RightFloatCell>
                     <template #left>
-                        {{ data.value.numTokens }}
+                        {{ data.value.tokens }}
                     </template>
                     <template #right>
-                        <InspectButton v-if="data.value.numTokens > 0"
+                        <InspectButton v-if="data.value.tokens > 0"
                             @click="preview = data.value.layerPreview; previewDocument = data.item" />
                     </template>
                 </RightFloatCell>
@@ -144,7 +141,7 @@ const columns = computed<Field[]>(() => {
         { key: "name", sortOn: (x: DocumentMetadata) => x.name, textAlign: "left" },
         { key: "format", sortOn: (x: DocumentMetadata) => x.format },
         { key: "preview", textAlign: "left" },
-        { key: "layerSummary" },
+        { key: "layerSummary", label: "tokens", sortOn: (x: DocumentMetadata) => x.layerSummary?.tokens },
         { key: "lastModified", label: "last modified", sortOn: (x: DocumentMetadata) => x.lastModified }
     ] as Field[];
     if (userStore.hasWriteAccess && props.type == TableDocumentsType.User) {

client/src/components/tables/LayerViewer.vue

@@ -26,8 +26,6 @@ const columns = computed(() => {
 
 const items = computed(() => {
   return props.layer?.terms.map((term) => {
-    delete term.annotations["token"]
-    term.annotations["token"] = term.targets.map(x => x.literal).join('_')
     return term.annotations
   })
 })

client/src/stores/documents.ts

@@ -28,7 +28,7 @@ const documents = defineStore('documents', () => {
     // Fields
     const loading = ref(false)
     const available = ref([] as DocumentMetadata[])
-    const numSourceAnnotations = computed(() => available.value.filter(i => i.layerSummary?.numTokens > 0).length)
+    const numSourceAnnotations = computed(() => available.value.filter(i => i.layerSummary?.tokens > 0).length)
     const totalSizeInChars = computed(() => available.value.reduce((x, y) => x + y.numChars, 0))
     const uploading: Record<string, FileStatus> = reactive({})
     const uploadBusyCount = computed(() => Object.values(uploading).filter(i => i.status === "busy").length)

client/src/stores/evaluation.ts

@@ -11,7 +11,7 @@ import { UUID } from "@/types/corpora"
 // For some reason the terms are undefined sometimes
 // We handle it here
 export function literalsForTerm(term: Term): string {
-    return term.targets.map(x => x.literal).join("..")
+    return term.annotations["token"]
 }
 
 export function literalsForTermComparison(termComparison: TermComparison): string {

client/src/stores/taggers.ts

@@ -7,10 +7,10 @@ import { Tagger } from '@/types/taggers'
 import * as API from '@/api/taggers'
 
 /**
- * Sort the 'produces' field of the taggers. The order is stochastic when retrieved from the API.
+ * Sort the 'annotations' field of the taggers. The order is stochastic when retrieved from the API.
  * For the interface, we want the order to be fixed.
  */
-export function sort_tagger_produces(types: string[]): string[] {
+export function sort_tagger_annotations(types: string[]): string[] {
     // By pure coincidence, reverse sorting makes the order TOK, POS, LEM, which is acceptable.
     // But we might want a different order at some point.
     return types.sort((a, b) => b.localeCompare(a))

client/src/stores/user.ts

@@ -15,9 +15,9 @@ const useUser = defineStore('user', () => {
     const corporaStore = stores.useCorpora() as CorporaStore
 
     // Fields
-    const user = ref({ id: 'NO USER', admin: false } as User)
+    const user = ref({ id: 'NO USER', isAdmin: false } as User)
     const hasWriteAccess = computed((): boolean => {
-        return corporaStore.userIsCollaborator || user.value.admin || corporaStore.activeCorpus?.owner === user.value.id
+        return corporaStore.userIsCollaborator || user.value.isAdmin || corporaStore.activeCorpus?.owner === user.value.id
     })
     const hasDeleteAccess = computed((): boolean => {
         return canDelete(corporaStore.activeCorpus)
@@ -30,7 +30,7 @@ const useUser = defineStore('user', () => {
      */
     function canDelete(corpus: CorpusMetadata | null): boolean {
         if (!corpus) return false
-        return corpus.owner === user.value.id || user.value.admin
+        return corpus.owner === user.value.id || user.value.isAdmin
     }
 
     /**