fix(blueprints): no more namespace & tag in blueprint URI

kestra-io · Oct 24, 2024 · 08a0182 · 08a0182
1 parent 8ac187c
commit 08a0182
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git a/components/blueprints/Lists.vue b/components/blueprints/Lists.vue
@@ -95,18 +95,6 @@ if(route.query.tags) {
 }
 if(route.query.q) searchQuery.value = route.query.q;
 
-if (!activeTags.value) {
-  const id = route.params.slug?.split('-')[0];
-  const {data: blueprintInformations} = await useAsyncData('blueprints-informations', () => {
-    return $fetch(`/api/blueprint?query=${id}`)
-  })
-
-  activeTags.value = [{ name: 'All tags' }];
-  if (blueprintInformations && blueprintInformations.value) {
-    let tag = tags.value.find(f => f?.id == blueprintInformations.value.page.tags[0]);
-    await navigateTo(`/blueprints/${tag.id}/${route.params.slug}`);
-  }
-}
 const { data: blueprintsData, error } = await useAsyncData('blueprints', () => {
   return $fetch(`${config.public.apiUrl}/blueprints/versions/latest?page=${currentPage.value}&size=${itemsPerPage.value}${route.query.tags ? `&tags=${activeTags.value.map(tag => tag.id).join(',')}` : ''}${route.query.q ? `&q=${searchQuery.value}` : ''}`)
 })
@@ -131,8 +119,7 @@ const changePage = (pageNo) => {
 };
 
 const generateCardHref = (blueprint) => {
-  let tag = tags.value.find(f => f?.id == blueprint.tags[0]);
-  return `/blueprints/${tag.id}/${blueprint.id}`
+  return `/blueprints/${blueprint.id}`
 }
 
 let timer;

diff --git a/components/blueprints/Related.vue b/components/blueprints/Related.vue
@@ -12,8 +12,7 @@
         },
         methods: {
           generateCardHref (blueprint) {
-            let tag = this.tags.find(f => f?.id == blueprint.tags[0]);
-            return `/blueprints/${tag.id}/${blueprint.id}`
+            return `/blueprints/${blueprint.id}`
           }
         },
     }

diff --git a/components/use-cases/engineers/ExploreBlueprints.vue b/components/use-cases/engineers/ExploreBlueprints.vue
@@ -48,9 +48,9 @@
   const generateCardHref = (blueprint) => {
     let tag = tags.value.find(f => f?.id == blueprint.tags[0]);
     if (!tag || !tag.id) {
-        return `/blueprints/unknown/${blueprint.id}`;
+        return `/blueprints/${blueprint.id}`;
     }
-    return `/blueprints/${tag.id}/${blueprint.id}`
+    return `/blueprints/${blueprint.id}`
   }
   if (blueprintsData.value) {
     blueprints.value = blueprintsData.value.results

diff --git a/pages/blueprints/[slug]/[id].vue → pages/blueprints/[id].vue b/pages/blueprints/[slug]/[id].vue → pages/blueprints/[id].vue
@@ -38,18 +38,15 @@
     const description = ref()
     const flowAsMd = ref("")
 
-    const categorySlug = route.fullPath?.split('/')[2];
     const {data: tags} = await useAsyncData('blueprints-tags', () => {
         return $fetch(`${config.public.apiUrl}/blueprints/versions/latest/tags`)
     })
 
-    const activeTag = tags.value.find(f => f?.name?.toLowerCase() == categorySlug.replace('-', ' '));
-
     const {data: blueprintInformations, error} = await useAsyncData('blueprints-informations', () => {
         return $fetch(`/api/blueprint?query=${route.params.id}`)
     })
 
-    if ((error && error.value) || (!activeTag && categorySlug !== 'all-tags')) {
+    if (error && error.value) {
       throw createError({statusCode: 404, message: 'Page not found', data: error, fatal: true})
     }