Merge pull request #6052 from vuestorefront/#5871/redirect-nonexistin…

…g-category Redirect to 404 page when category does not exist
vuestorefront · Aug 25, 2021 · e50c7b1 · e50c7b1
2 parents 37c21df + 3c39655
commit e50c7b1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/core/docs/changelog/5871.js b/packages/core/docs/changelog/5871.js
@@ -0,0 +1,8 @@
+module.exports = {
+  description: 'Redirect to 404 page when category page does not exist',
+  link: 'https://github.com/vuestorefront/vue-storefront/issues/5871',
+  isBreaking: false,
+  breakingChanges: [],
+  author: 'Łukasz Jędrasik',
+  linkToGitHubAccount: 'https://github.com/lukaszjedrasik'
+};
diff --git a/packages/core/nuxt-theme-module/theme/pages/Category.vue b/packages/core/nuxt-theme-module/theme/pages/Category.vue
@@ -236,7 +236,7 @@
             <span class="products__show-on-page__label">{{ $t('Show on page') }}</span>
             <LazyHydrate on-interaction>
               <SfSelect
-                :value="pagination.itemsPerPage.toString()"
+                :value="pagination && pagination.itemsPerPage ? pagination.itemsPerPage.toString() : ''"
                 class="products__items-per-page"
                 @input="th.changeItemsPerPage"
               >
@@ -372,7 +372,7 @@ export default {
     const uiState = useUiState();
     const { addItem: addItemToCart, isInCart } = useCart();
     const { addItem: addItemToWishlist, isInWishlist, removeItem: removeItemFromWishlist } = useWishlist();
-    const { result, search, loading } = useFacet();
+    const { result, search, loading, error } = useFacet();
 
     const products = computed(() => facetGetters.getProducts(result.value));
     const categoryTree = computed(() => facetGetters.getCategoryTree(result.value));
@@ -405,6 +405,7 @@ export default {
 
     onSSR(async () => {
       await search(th.getFacetsFromURL());
+      if (error?.value?.search) context.root.$nuxt.error({ statusCode: 404 });
       setSelectedFilters();
     });