Redirect 404 when OTU or Taxon name doesnt exist. Catch distribution …

…error
wbbaker · Aug 7, 2023 · add9d68 · add9d68
1 parent 96d5c45
commit add9d68
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/src/modules/404/router/index.js b/src/modules/404/router/index.js
@@ -2,5 +2,6 @@ import notFound from '../view/index.vue'
 
 export default {
   path: '/:pathMatch(.*)*',
+  name: 'notFound',
   component: notFound
 }
diff --git a/src/modules/otus/helpers/useOtuPageRequest.js b/src/modules/otus/helpers/useOtuPageRequest.js
@@ -4,9 +4,13 @@ export function useOtuPageRequest(key, requestFunction) {
   const store = useOtuPageRequestStore()
   const request = requestFunction()
 
-  request.then((response) => {
-    store.setRequest(key, response)
-  })
+  request
+    .then((response) => {
+      store.setRequest(key, response)
+    })
+    .catch((error) => {
+      store.setRequest(key, error.response)
+    })
 
   return request
 }
diff --git a/src/modules/otus/store/store.js b/src/modules/otus/store/store.js
@@ -52,10 +52,17 @@ export const useOtuStore = defineStore('otuStore', {
 
       requestStore.$reset()
 
-      await this.loadOtu(otuId)
-      await this.loadTaxon(this.otu.taxon_name_id)
+      try {
+        await this.loadOtu(otuId)
+        await this.loadTaxon(this.otu.taxon_name_id)
+      } catch (error) {
+        return false
+      }
+
       await this.loadCatalog(this.otu.taxon_name_id)
       await this.loadTaxonomy(otuId)
+
+      return true
     },
 
     async loadImages(otuId) {

diff --git a/src/modules/otus/views/Index.vue b/src/modules/otus/views/Index.vue
@@ -132,8 +132,13 @@ onBeforeUnmount(() => {
 
 async function loadInitialData() {
   store.$reset()
-  await store.loadInit(route.params.id)
-  updateMetadata()
+  const success = await store.loadInit(route.params.id)
+
+  if (success) {
+    updateMetadata()
+  } else {
+    router.replace({ name: 'notFound' })
+  }
 }
 
 function updateMetadata() {