Merge branch 'dev'

src/auth/auth.composable.js

@@ -51,7 +51,7 @@ export function useAuth() {
       router.push("/access-denied");
       return;
     }
-    callback();
+    callback?.();
   }
 
   /** Fetch JWT, store it and use it for API client. */

src/corpus/Corpus.vue

@@ -23,22 +23,28 @@
 </template>
 
 <script setup>
+import { computed } from "vue";
 import { useAuth } from "@/auth/auth.composable";
 import { useCorpusStore } from "@/store/corpus.store";
 import useCorpusIdParam from "./corpusIdParam.composable";
+import useCorpora from "@/corpora/corpora.composable";
 import useCorpus from "./corpus.composable.js";
 import useConfig from "./config/config.composable";
 import PageTitle from "@/components/PageTitle.vue";
 
 const corpusStore = useCorpusStore();
 const { requireAuthentication, isAuthenticated } = useAuth();
 const corpusId = useCorpusIdParam();
+const { loadCorpora } = useCorpora();
 const { loadCorpus } = useCorpus(corpusId);
 const { corpusName } = useConfig(corpusId);
 
-const corpus = corpusStore.corpora[corpusId];
+const corpus = computed(() => corpusStore.corpora[corpusId]);
 
-requireAuthentication(loadCorpus);
+requireAuthentication(async () => {
+  await loadCorpora();
+  await loadCorpus();
+});
 </script>
 
 <style></style>

src/corpus/config/config.composable.js

@@ -9,8 +9,8 @@ export default function useConfig(corpusId) {
   const { th } = useLocale();
   const mink = useMinkBackend();
 
-  const corpus = corpusStore.corpora[corpusId];
-  const config = computed(() => corpus?.config);
+  const corpus = computed(() => corpusStore.corpora[corpusId]);
+  const config = computed(() => corpus.value?.config);
   const corpusName = computed(() => th(config.value?.name));
 
   async function loadConfig() {
@@ -21,7 +21,7 @@ export default function useConfig(corpusId) {
         if (error.response?.status == 404) return emptyConfig();
         throw error;
       });
-    corpus.config = config;
+    corpus.value.config = config;
   }
 
   async function uploadConfig(config, corpusId_ = corpusId) {

src/corpus/exports/exports.composable.js

@@ -6,14 +6,14 @@ import useMessenger from "@/message/messenger.composable";
 
 export default function useExports(corpusId) {
   const corpusStore = useCorpusStore();
-  const corpus = corpusStore.corpora[corpusId];
-  const exports = computed(() => corpus?.exports);
+  const corpus = computed(() => corpusStore.corpora[corpusId]);
+  const exports = computed(() => corpus.value?.exports);
   const mink = useMinkBackend();
   const { alertError } = useMessenger();
 
   async function loadExports() {
     const exports = await mink.loadExports(corpusId).catch(alertError);
-    corpus.exports = exports;
+    corpus.value.exports = exports;
   }
 
   async function downloadResult() {

src/corpus/job/job.composable.js

@@ -49,31 +49,31 @@ class JobStatus {
 
 export default function useJob(corpusId) {
   const corpusStore = useCorpusStore();
-  const corpus = corpusStore.corpora[corpusId];
+  const corpus = computed(() => corpusStore.corpora[corpusId]);
   const mink = useMinkBackend();
   const { alertError } = useMessenger();
 
   async function loadJob() {
-    corpus.status = await mink
+    corpus.value.status = await mink
       .loadJob(corpusId)
       .catch(() => ({}))
       .catch(alertError);
   }
 
   async function runJob() {
-    corpus.status = await mink.runJob(corpusId).catch(alertError);
+    corpus.value.status = await mink.runJob(corpusId).catch(alertError);
   }
 
   async function install() {
-    corpus.status = await mink.install(corpusId).catch(alertError);
+    corpus.value.status = await mink.install(corpusId).catch(alertError);
   }
 
   async function abortJob() {
     await mink.abortJob(corpusId).catch(alertError);
     await loadJob();
   }
 
-  const jobStatus = computed(() => corpus?.status);
+  const jobStatus = computed(() => corpus.value?.status);
   const sparvStatus = computed(
     () => new JobStatus(jobStatus.value?.job_status?.sparv)
   );

src/i18n/locale.composable.js

@@ -3,7 +3,7 @@ import { useI18n } from "vue-i18n";
 import { useStorage } from "@vueuse/core";
 import { filesize } from "filesize";
 
-const storedLocale = useStorage("locale");
+const storedLocale = useStorage("locale", "");
 
 export default function useLocale() {
   const { locale } = useI18n();