More plausible

Author: PrinsINT

client/src/api/evaluation.ts

@@ -31,7 +31,7 @@ const confusionSamplesPath = (corpus: UUID): string =>
     `${confusionPath(corpus)}/download`
 export const distributionPath = (corpus: UUID): string =>
     `${evaluationPath(corpus)}/distribution`
-const metricsPath = (corpus: UUID): string =>
+export const metricsPath = (corpus: UUID): string =>
     `${evaluationPath(corpus)}/metrics`
 const metricsSamplesPath = (corpus: UUID): string =>
     `${metricsPath(corpus)}/download`

client/src/api/jobs.ts

@@ -10,11 +10,9 @@ type JobsResponse = AxiosResponse<Job[]>
 type JobResponse = AxiosResponse<Job>
 export type ProgressResponse = AxiosResponse<Progress>
 
-const jobsPath = (corpus: UUID): string => `/corpora/${corpus}/jobs`
+export const jobsPath = (corpus: UUID): string => `/corpora/${corpus}/jobs`
 const jobPath = (corpus: UUID, job: string): string =>
     `/corpora/${corpus}/jobs/${job}`
-const jobIsBusyPath = (corpus: UUID, job: string): string =>
-    `/corpora/${corpus}/jobs/${job}/isBusy`
 const jobProgressPath = (corpus: UUID, job: string): string =>
     `/corpora/${corpus}/jobs/${job}/progress`
 
@@ -26,15 +24,6 @@ export function getJobs(corpus: UUID): Promise<JobsResponse> {
     return axios.get(jobsPath(corpus), { params: { hasResult: false } })
 }
 
-/**
- * Fetch a single job for a corpus.
- * @param corpus UUID of the corpus.
- * @param job Tagger job name.
- */
-export function getJob(corpus: UUID, job: string): Promise<JobResponse> {
-    return axios.get(jobPath(corpus, job))
-}
-
 /**
  * Post a job to start it. Will return an immediate ProgressResponse.busy=true to give the illusion of a started job.
  * @param corpus UUID of the corpus.
@@ -58,16 +47,6 @@ export function cancelOrDeleteJob(
     return axios.delete(jobPath(corpus, job), { params: { hard: hard } })
 }
 
-/**
- * Simplified job progress poll.
- */
-export function getJobIsBusy(
-    corpus: UUID,
-    job: string
-): Promise<AxiosResponse<boolean>> {
-    return axios.get(jobIsBusyPath(corpus, job))
-}
-
 /**
  * Poll for job progress.
  */

client/src/api/taggers.ts

@@ -35,5 +35,5 @@ export function getTaggerHealth(tagger: string): Promise<TaggerHealthResponse> {
  * Summed over all taggers & corpora on the server.
  */
 export function getDocsAtTaggers(): Promise<TaggersBusyResponse> {
-    return axios.get(`${taggersPath}/active`)
+    return axios.get(`${taggersPath}/queue`)
 }

client/src/api/useAxios.ts

@@ -7,7 +7,7 @@ export function useAxios<T>(
     params?: MaybeRefOrGetter<Record<string, string | number | boolean>>,
     pageReloadOnError?: boolean
 ): {
-    data: Ref<T | undefined>
+    data: Ref<T>
     loading: Ref<boolean>
     reload: () => void
 } {
@@ -20,7 +20,10 @@ export function useAxios<T>(
 
     function execute(): void {
         const url: string | undefined = toValue(urlRef)
-        if (url === undefined) return
+        if (url === undefined) {
+            data.value = initial
+            return
+        }
 
         loading.value = true
         axios

client/src/components/AnnotateTab.vue

@@ -6,7 +6,7 @@
         <GSpinner />
     </GCard>
     <!-- No corpus selected -->
-    <GCard v-else-if="!corporaStore.activeCorpus && !hideCorpusError" title="No corpus selected">
+    <GCard v-else-if="!corporaStore.corpus && !hideCorpusError" title="No corpus selected">
         <GInfo error>
             <p>No corpus has been selected.</p>
             <router-link to="/annotate/corpora">Select a corpus</router-link>
@@ -28,7 +28,7 @@
         <GSpinner />
     </GCard>
     <!-- No non-empty jobs-->
-    <GCard v-else-if="jobSelectionStore.selectableJobs.length == 0 && !hideAnnotationsError" title="No annotations">
+    <GCard v-else-if="jobSelectionStore.options.length == 0 && !hideAnnotationsError" title="No annotations">
         <GInfo error>
             <p>None of the documents have annotations. Either:</p>
             <ul>

client/src/components/GCard.vue

@@ -5,7 +5,8 @@
                 <h3 class="h3">
                     <slot name="title">{{ title }}</slot>
                 </h3>
-                <GButton v-if="$slots.help" class="help-btn" title="Help" plain @click="expand = !expand">
+                <GButton v-if="$slots.help" class="help-btn" title="Help" plain
+                    @click="expand = !expand; plausible.helpClicked()">
                     {{ expand ? "&times;" : "?" }}
                 </GButton>
             </hgroup>
@@ -26,6 +27,7 @@
 </template>
 
 <script setup lang="ts">
+import { plausible } from "@/ts/plausible"
 import type { HelpLink } from "@/types/ui/help"
 
 // --- props ---
@@ -36,7 +38,7 @@ const { helpLink, title } = defineProps<{
 }>()
 
 // --- data ---
-const expand = ref(false)
+const expand = ref<boolean>()
 </script>
 
 <style scoped lang="scss">

client/src/components/GSpinner.vue

@@ -9,15 +9,15 @@
 </template>
 
 <script setup lang="ts">
-const props = defineProps<{
+const { error, small, still } = defineProps<{
     error?: boolean
     small?: boolean
     still?: boolean
 }>()
 const classes = {
-    error: props.error,
-    small: props.small,
-    still: props.still
+    error: error,
+    small: small,
+    still: still
 }
 </script>
 

client/src/components/help/CorpusHelp.vue

@@ -2,7 +2,8 @@
     <h2>Step 1: Corpora</h2>
     <ol>
         <li>Click <InlineTextButton green>new</InlineTextButton> to create a new corpus.</li>
-        <li>Select a corpus and click <InlineTextButton orange>edit</InlineTextButton> to modify the metadata</li>
-        <li>Select a corpus and click <InlineTextButton red>delete</InlineTextButton> to remove the selected corpus</li>
+        <li>Select a corpus and click <InlineTextButton orange>edit</InlineTextButton> to modify the metadata.</li>
+        <li>Select a corpus and click <InlineTextButton red>delete</InlineTextButton> to remove the selected corpus.
+        </li>
     </ol>
 </template>

client/src/components/input/GButton.vue

@@ -15,15 +15,15 @@ const { disabled, red, orange, green, plain, loading } = defineProps<{
     loading?: boolean
 }>()
 
-const classes = computed(() => ({
+const classes = computed<Record<string, boolean>>(() => ({
     red: red,
     orange: orange,
     green: green,
     plain: plain,
     disabled: disabled
 }))
 
-defineEmits<{
+const emit = defineEmits<{
     click: []
 }>()
 </script>

client/src/components/input/GInput.vue

@@ -30,7 +30,7 @@ const {
     focus?: boolean
 }>()
 
-const inputElement = ref<HTMLInputElement>()
+const inputElement = useTemplateRef<HTMLInputElement>("inputElement")
 onMounted(() => {
     if (focus) {
         nextTick(() => {