From 87a4222f25a4b790446c35d65a1664afea8f9f88 Mon Sep 17 00:00:00 2001 From: Traxus Date: Tue, 25 Apr 2023 00:29:45 -0400 Subject: [PATCH] Signed-off-by: Traxus --- src/lib/datocms-bypass.ts | 15 --------------- src/pages/blog/[slug].tsx | 2 +- src/pages/blog/index.tsx | 19 +++++++++---------- 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/src/lib/datocms-bypass.ts b/src/lib/datocms-bypass.ts index 03c413f..52c7712 100644 --- a/src/lib/datocms-bypass.ts +++ b/src/lib/datocms-bypass.ts @@ -21,21 +21,6 @@ function datocmsDateToIng(date: string): number { return dateInt } -export function queriedPostsHasResults(queriedPosts: any) { - if ('pages' in queriedPosts === true) { - if (0 in queriedPosts.pages === true) { - if ('pagination' in queriedPosts.pages[0]) { - if ('total' in queriedPosts.pages[0].pagination) { - if (queriedPosts.pages[0].pagination.total > 0) { - return true - } - } - } - } - } - return false -} - //-----graphql query interception export async function datocmsQueryIntercept(query: any) { const parent = pluckFirstParentFromQuery(query) diff --git a/src/pages/blog/[slug].tsx b/src/pages/blog/[slug].tsx index 262dbd5..81fc008 100644 --- a/src/pages/blog/[slug].tsx +++ b/src/pages/blog/[slug].tsx @@ -130,7 +130,7 @@ export const getStaticProps: GetStaticProps = async ( relatedBlogPostsFromSource = allBlogPosts.data.filter((p) => p.category.some((c) => post?.category.some( - (postCategory: any) => c.slug === postCategory.slug) + (postCategory: any) => c.slug === postCategory.slug) ) ) } diff --git a/src/pages/blog/index.tsx b/src/pages/blog/index.tsx index a36401e..ce80689 100644 --- a/src/pages/blog/index.tsx +++ b/src/pages/blog/index.tsx @@ -119,23 +119,22 @@ const BlogIndexPage = ({ } ) - function queriedPostsHasResults(queriedPosts: any) { - if ('pages' in queriedPosts === true) { - if (0 in queriedPosts.pages === true) { - if ('pagination' in queriedPosts.pages[0]) { - if ('total' in queriedPosts.pages[0].pagination) { - if (queriedPosts.pages[0].pagination.total > 0) { - return true - } + let queriedPostsHasResults = false + + if ('pages' in queriedPosts === true) { + if (0 in queriedPosts.pages === true) { + if ('pagination' in queriedPosts.pages[0]) { + if ('total' in queriedPosts.pages[0].pagination) { + if (queriedPosts.pages[0].pagination.total > 0) { + queriedPostsHasResults = true } } } } - return false } //const hasResults = !!queriedPosts?.pages[0]?.data?.length - const hasResults = queriedPostsHasResults(queriedPosts) + const hasResults = queriedPostsHasResults return (