Use resource-info also for sources, #143

CHANGELOG.md

@@ -15,7 +15,7 @@ As this project is a user-facing application, the places in the semantic version
 
 ### Changed
 
-- Use new `resource-info` route, drop `check-status`
+- Use new `resource-info` route, drop `check-status` and `list-sources`
 - The local storage key is now tagged with a datestamp, and should be changed when the data shape of the state changes
 
 ## [1.0.5] (2023-11-28)

src/api/api.js

@@ -57,13 +57,6 @@ class MinkApi {
     return response.data;
   }
 
-  async listSources(corpusId) {
-    const response = await this.axios.get("list-sources", {
-      params: { corpus_id: corpusId },
-    });
-    return response.data.contents;
-  }
-
   async downloadSourceFile(corpusId, filename, binary = false) {
     const response = await this.axios.get("download-sources", {
       params: { corpus_id: corpusId, file: filename, zip: false },

src/api/backend.composable.js

@@ -38,13 +38,6 @@ export default function useMinkBackend() {
       `corpus/${corpusId}/config`
     );
 
-  const loadSources = (corpusId) =>
-    spin(
-      api.listSources(corpusId),
-      t("source.list.loading"),
-      `corpus/${corpusId}/sources`
-    );
-
   const downloadSource = (corpusId, filename, binary) =>
     spin(
       api.downloadSourceFile(corpusId, filename, binary),
@@ -135,7 +128,6 @@ export default function useMinkBackend() {
     deleteCorpus,
     loadConfig,
     saveConfig,
-    loadSources,
     downloadSource,
     downloadPlaintext,
     uploadSources,

src/corpus/corpus.composable.js

@@ -5,8 +5,6 @@ import useMessenger from "@/message/messenger.composable";
 import useCorpora from "@/corpora/corpora.composable";
 import useConfig from "./config/config.composable";
 import useExports from "./exports/exports.composable";
-import useSources from "./sources/sources.composable";
-import useJob from "./job/job.composable";
 
 /** Let data be refreshed initially, but skip subsequent load calls. */
 const isCorpusFresh = {};
@@ -19,23 +17,33 @@ export default function useCorpus(corpusId) {
   const { alertError } = useMessenger();
   const { loadConfig } = useConfig(corpusId);
   const { loadExports } = useExports(corpusId);
-  const { loadJob } = useJob(corpusId);
-  const { loadSources } = useSources(corpusId);
 
   async function loadCorpus(force = false) {
+    // Make sure the corpus has an entry in the store.
     await loadCorpora();
     if (isCorpusFresh[corpusId] && !force) {
       return;
     }
+
+    // Load all essential info about the corpus.
     await Promise.all([
       loadConfig(), //
       loadExports(),
-      loadJob(),
-      loadSources(),
+      loadResourceInfo(),
     ]);
+
+    // Remember to skip loading next time.
     isCorpusFresh[corpusId] = true;
   }
 
+  /** Load job status and source files in the same request. */
+  async function loadResourceInfo() {
+    const info = await mink.resourceInfo(corpusId).catch(alertError);
+    corpusStore.corpora[corpusId].name = info.resource.name;
+    corpusStore.corpora[corpusId].sources = info.resource.source_files;
+    corpusStore.corpora[corpusId].status = info.job;
+  }
+
   async function deleteCorpus(corpusId_ = corpusId) {
     // Delete corpus in the backend.
     await mink.deleteCorpus(corpusId_).catch(alertError);

src/corpus/sources/sources.composable.js

@@ -13,8 +13,8 @@ export default function useSources(corpusId) {
   const sources = computed(() => corpusStore.corpora[corpusId]?.sources || []);
 
   async function loadSources(corpusId_ = corpusId) {
-    const sourcesFetched = await mink.loadSources(corpusId_).catch(alertError);
-    corpusStore.corpora[corpusId_].sources = sourcesFetched;
+    const info = await mink.resourceInfo(corpusId_).catch(alertError);
+    corpusStore.corpora[corpusId_].sources = info.resource.source_files;
   }
 
   async function downloadSource(source, binary) {