From 88e0de012ceba251a3d8b84902fc8db34f379d68 Mon Sep 17 00:00:00 2001
From: Arild Matsson <arild.matsson@gu.se>
Date: Thu, 4 Jan 2024 12:45:34 +0100
Subject: [PATCH] Check if corpus deletion succeeds, fix #140

---
 CHANGELOG.md                    | 4 ++++
 src/corpus/CorpusDelete.vue     | 6 +++++-
 src/corpus/corpus.composable.js | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2e6c0d..39cda41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,10 @@ As this project is a user-facing application, the places in the semantic version
 - `RouteButton` component replaces `router-link > ActionButton`
 - `ActionButton` uses `<button>` and is tabbable
 
+### Fixed
+
+- Error handling when deleting corpus
+
 ### Removed
 
 - `useVariant`
diff --git a/src/corpus/CorpusDelete.vue b/src/corpus/CorpusDelete.vue
index 9d641b7..83e9b59 100644
--- a/src/corpus/CorpusDelete.vue
+++ b/src/corpus/CorpusDelete.vue
@@ -6,14 +6,18 @@ import RouteButton from "@/components/RouteButton.vue";
 import Section from "@/components/Section.vue";
 import PendingContent from "@/spin/PendingContent.vue";
 import useCorpus from "./corpus.composable";
+import { useCorpusStore } from "@/store/corpus.store";
 
 const router = useRouter();
 const corpusId = useCorpusIdParam();
 const { deleteCorpus } = useCorpus(corpusId);
+const corpusStore = useCorpusStore();
 
 async function doDelete() {
   await deleteCorpus();
-  router.push("/corpus");
+  if (!(corpusId in corpusStore.corpora)) {
+    router.push("/corpus");
+  }
 }
 </script>
 
diff --git a/src/corpus/corpus.composable.js b/src/corpus/corpus.composable.js
index 348dbaf..8a0fd20 100644
--- a/src/corpus/corpus.composable.js
+++ b/src/corpus/corpus.composable.js
@@ -12,7 +12,7 @@ export default function useCorpus(corpusId) {
   const corpusStore = useCorpusStore();
   const { refreshJwt } = useAuth();
   const mink = useMinkBackend();
-  const { loadCorpora } = useCorpora();
+  const { loadCorpora, refreshCorpora } = useCorpora();
   const { alertError } = useMessenger();
   const { loadConfig } = useConfig(corpusId);
 
@@ -39,7 +39,7 @@ export default function useCorpus(corpusId) {
     // The backend will have updated the remote JWT, so refresh our copy.
     // The backend uses the corpus list within it when listing available corpora.
     await refreshJwt();
-    corpusStore.removeCorpus(corpusId_);
+    await refreshCorpora();
   }
 
   return { loadCorpus, deleteCorpus };