Merge pull request #143 from nih-sparc/fix-history-stack-for-back-button

fixed history stack when internally redirecting
nih-sparc · Jun 28, 2024 · 38aba78 · 38aba78
2 parents 319926c + 9ca6033
commit 38aba78
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 19 deletions.
diff --git a/pages/about/[aboutDetailsId].vue b/pages/about/[aboutDetailsId].vue
@@ -88,7 +88,8 @@ export default {
           return await $contentfulClient.getEntry(params.aboutDetailsId).then(async (response) => {
             const slug = pathOr("", ['fields', 'slug'], response)
             if (!isEmpty(slug)) {
-              await navigateTo(`/about/${slug}`)
+              const router = useRouter()
+              await router.replace({ path: `/about/${slug}` })
             }
             return response
           })

diff --git a/pages/about/get-involved/[id].vue b/pages/about/get-involved/[id].vue
@@ -3,7 +3,8 @@ export default {
   async setup() {
     const route = useRoute()
     const newPath = route.href.replace('/about/get-involved', '/about')
-    await navigateTo(newPath, { redirectCode: 301 })
+    const router = useRouter()
+    await router.replace({ path: newPath })
   }
 }
 </script>
diff --git a/pages/about/sparc-portal/metrics/index.vue b/pages/about/sparc-portal/metrics/index.vue
@@ -3,7 +3,8 @@ export default {
   name: 'MetricsPage',
 
   async setup() {
-    await navigateTo("/about/metrics", { redirectCode: 301 })
+    const router = useRouter()
+    await router.replace({ path: "/about/metrics" })
   },
 }
 </script>
diff --git a/pages/about/team-and-leadership/[id].vue b/pages/about/team-and-leadership/[id].vue
@@ -3,7 +3,8 @@ export default {
   async setup() {
     const route = useRoute()
     const newPath = route.href.replace('/about/team-and-leadership', '/about')
-    await navigateTo(newPath, { redirectCode: 301 })
+    const router = useRouter()
+    await router.replace({ path: newPath })
   }
 }
 </script>
diff --git a/pages/about/what-we-offer/[id].vue b/pages/about/what-we-offer/[id].vue
@@ -3,7 +3,8 @@ export default {
   async setup() {
     const route = useRoute()
     const newPath = route.href.replace('/about/what-we-offer', '/about')
-    await navigateTo(newPath, { redirectCode: 301 })
+    const router = useRouter()
+    await router.replace({ path: newPath })
   }
 }
 </script>
diff --git a/pages/data/index.vue b/pages/data/index.vue
@@ -170,7 +170,8 @@ export default {
       if (focusQuery) {
         newPath += `&selectedProjectsAnatomicalFocusIds=${focusQuery}`
       }
-      return navigateTo(newPath)
+      const router = useRouter()
+      await router.replace({ path: newPath })
     }
     const { $algoliaClient } = useNuxtApp()
     const algoliaSortOptions = [

diff --git a/pages/maps/index.vue b/pages/maps/index.vue
@@ -2,17 +2,18 @@
 import { pathOr, isEmpty } from 'ramda'
 import { infoMessage } from '@/utils/notification-messages'
 export default {
-  async setup() {
+  setup() {
     const route = useRoute()
-    const emptyParam = pathOr('', ['query'], route)
+    const query = pathOr('', ['query'], route)
     let newPath = ''
-    if (isEmpty(emptyParam)) {
+    if (isEmpty(query)) {
       newPath = route.href.replace('/maps', '/apps')
       infoMessage('All available map viewers have now been integrated with SPARC Apps and can be found below!')
     } else {
-      newPath = route.href.replace('/maps', '/apps/maps')
+      newPath = route.href.replace('/maps', `/apps/maps?${query}`)
     }
-    await navigateTo(newPath, { redirectCode: 301 })
+    const router = useRouter()
+    router.replace({ path: newPath, query: query })
   }
 }
 </script>
diff --git a/pages/news-and-events/community-spotlight/submit/index.vue b/pages/news-and-events/community-spotlight/submit/index.vue
@@ -1,7 +1,8 @@
 <script>
 export default {
   async setup() {
-    await navigateTo("/contact-us?type=story", { redirectCode: 301 })
-  },
+    const router = useRouter()
+    await router.replace({ path: "/contact-us?type=story" })
+  }
 }
 </script>
diff --git a/pages/news-and-events/community-spotlight/success-stories/index.vue b/pages/news-and-events/community-spotlight/success-stories/index.vue
@@ -1,7 +1,8 @@
 <script>
 export default {
   async setup() {
-    await navigateTo("/news-and-events/community-spotlight?selectedSpotlightTypes=successStory", { redirectCode: 301 })
+    const router = useRouter()
+    await router.replace({ path: "/news-and-events/community-spotlight?selectedSpotlightTypes=successStory" })
   }
 }
-</script>
+</script>
diff --git a/pages/news-and-events/submit/index.vue b/pages/news-and-events/submit/index.vue
@@ -1,7 +1,8 @@
 <script>
 export default {
   async setup() {
-    await navigateTo("/contact-us?type=story", { redirectCode: 301 })
-  },
+    const router = useRouter()
+    await router.replace({ path: "/contact-us?type=story" })
+  }
 }
 </script>
diff --git a/pages/projects/[projectId].vue b/pages/projects/[projectId].vue
@@ -2,8 +2,9 @@
 export default {
   async setup() {
     const route = useRoute()
+    const router = useRouter()
     const newPath = route.href.replace('/projects', '/about/projects')
-    await navigateTo(newPath, { redirectCode: 301 })
+    await router.replace({ path: newPath })
   },
 }
 </script>
diff --git a/pages/resources/[resourceId].vue b/pages/resources/[resourceId].vue
@@ -2,8 +2,9 @@
 export default {
   async setup() {
     const route = useRoute()
+    const router = useRouter()
     const newPath = route.href.replace('/resources/', '/tools-and-resources/')
-    await navigateTo(newPath, { redirectCode: 301 })
+    await router.replace({ path: newPath })
   },
 }
 </script>