From 8b368b41af973e87e902f42113190795b7e2eae1 Mon Sep 17 00:00:00 2001 From: charli Date: Thu, 23 Mar 2023 14:04:21 +0100 Subject: [PATCH 1/7] fix loading of forum --- packages/ui/src/app/pages/Forum/ForumCategory.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui/src/app/pages/Forum/ForumCategory.tsx b/packages/ui/src/app/pages/Forum/ForumCategory.tsx index 75caf6efd9..26264abe09 100644 --- a/packages/ui/src/app/pages/Forum/ForumCategory.tsx +++ b/packages/ui/src/app/pages/Forum/ForumCategory.tsx @@ -60,7 +60,7 @@ export const ForumCategory = () => { } if (!category) { - return + return } return ( From 0da8d3b52077a77701dec60a7e243fb7cb3210b2 Mon Sep 17 00:00:00 2001 From: charli Date: Wed, 5 Apr 2023 11:04:32 +0200 Subject: [PATCH 2/7] fix loading state or no data state --- packages/ui/src/app/pages/Forum/ForumCategory.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/ui/src/app/pages/Forum/ForumCategory.tsx b/packages/ui/src/app/pages/Forum/ForumCategory.tsx index 26264abe09..9e20a5efba 100644 --- a/packages/ui/src/app/pages/Forum/ForumCategory.tsx +++ b/packages/ui/src/app/pages/Forum/ForumCategory.tsx @@ -33,7 +33,7 @@ export const ForumCategory = () => { const { id, type } = useParams<{ id: string; type?: 'archive' }>() const isArchive = type === 'archive' - const { category } = useForumCategory(id) + const { category, isLoading: isLoadingCategory } = useForumCategory(id) const { order, getSortProps } = useSort('updatedAt') const { isLoading: isLoadingThreads, @@ -59,6 +59,9 @@ export const ForumCategory = () => { return } + if (isLoadingCategory) { + return + } if (!category) { return } From 732918029768ee190402472f5d6a2c9807470658 Mon Sep 17 00:00:00 2001 From: charli Date: Mon, 10 Apr 2023 07:50:55 +0200 Subject: [PATCH 3/7] test --- packages/ui/src/app/pages/Forum/ForumCategory.tsx | 3 +++ packages/ui/src/forum/hooks/useForumCategory.ts | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/ui/src/app/pages/Forum/ForumCategory.tsx b/packages/ui/src/app/pages/Forum/ForumCategory.tsx index 9e20a5efba..8013c1d4bd 100644 --- a/packages/ui/src/app/pages/Forum/ForumCategory.tsx +++ b/packages/ui/src/app/pages/Forum/ForumCategory.tsx @@ -59,9 +59,12 @@ export const ForumCategory = () => { return } + if (isLoadingCategory) { return } + console.log(category) + if (!category) { return } diff --git a/packages/ui/src/forum/hooks/useForumCategory.ts b/packages/ui/src/forum/hooks/useForumCategory.ts index 2d557aa3a2..a16a0fd84a 100644 --- a/packages/ui/src/forum/hooks/useForumCategory.ts +++ b/packages/ui/src/forum/hooks/useForumCategory.ts @@ -3,7 +3,6 @@ import { asCategoryWithDetails } from '@/forum/types/ForumCategoryWithDetails' export const useForumCategory = (id: string) => { const { loading, data } = useGetForumCategoryQuery({ variables: { where: { id } } }) - return { isLoading: loading, category: data?.forumCategoryByUniqueInput && asCategoryWithDetails(data.forumCategoryByUniqueInput), From 5906523dd8c768b68667c449b934f95967b0d186 Mon Sep 17 00:00:00 2001 From: charli Date: Thu, 13 Apr 2023 15:30:35 +0200 Subject: [PATCH 4/7] fix loading state --- packages/ui/src/app/pages/Forum/ForumCategory.tsx | 8 +++++--- packages/ui/src/forum/hooks/useForumCategory.ts | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/ui/src/app/pages/Forum/ForumCategory.tsx b/packages/ui/src/app/pages/Forum/ForumCategory.tsx index 8013c1d4bd..2957491d60 100644 --- a/packages/ui/src/app/pages/Forum/ForumCategory.tsx +++ b/packages/ui/src/app/pages/Forum/ForumCategory.tsx @@ -33,7 +33,7 @@ export const ForumCategory = () => { const { id, type } = useParams<{ id: string; type?: 'archive' }>() const isArchive = type === 'archive' - const { category, isLoading: isLoadingCategory } = useForumCategory(id) + const { category, isLoading: isLoadingCategory, hasError } = useForumCategory(id) const { order, getSortProps } = useSort('updatedAt') const { isLoading: isLoadingThreads, @@ -59,11 +59,13 @@ export const ForumCategory = () => { return } - if (isLoadingCategory) { return } - console.log(category) + + if (hasError) { + return + } if (!category) { return diff --git a/packages/ui/src/forum/hooks/useForumCategory.ts b/packages/ui/src/forum/hooks/useForumCategory.ts index a16a0fd84a..c43789b61f 100644 --- a/packages/ui/src/forum/hooks/useForumCategory.ts +++ b/packages/ui/src/forum/hooks/useForumCategory.ts @@ -2,9 +2,10 @@ import { useGetForumCategoryQuery } from '@/forum/queries' import { asCategoryWithDetails } from '@/forum/types/ForumCategoryWithDetails' export const useForumCategory = (id: string) => { - const { loading, data } = useGetForumCategoryQuery({ variables: { where: { id } } }) + const { loading, data, error } = useGetForumCategoryQuery({ variables: { where: { id } } }) return { isLoading: loading, category: data?.forumCategoryByUniqueInput && asCategoryWithDetails(data.forumCategoryByUniqueInput), + hasError: !!error, } } From 260290f78afc5dcdd21efa22237fdb78ecea81ea Mon Sep 17 00:00:00 2001 From: charli Date: Thu, 13 Apr 2023 15:33:22 +0200 Subject: [PATCH 5/7] fix loading --- packages/ui/src/app/pages/Forum/ForumCategory.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui/src/app/pages/Forum/ForumCategory.tsx b/packages/ui/src/app/pages/Forum/ForumCategory.tsx index 2957491d60..cd5f70b233 100644 --- a/packages/ui/src/app/pages/Forum/ForumCategory.tsx +++ b/packages/ui/src/app/pages/Forum/ForumCategory.tsx @@ -66,7 +66,7 @@ export const ForumCategory = () => { if (hasError) { return } - + if (!category) { return } From 5508b928f6579a476566eab7c53faae95e857b73 Mon Sep 17 00:00:00 2001 From: Chaos77 <101491745+chrlschwb@users.noreply.github.com> Date: Fri, 21 Apr 2023 02:54:25 -0800 Subject: [PATCH 6/7] Update packages/ui/src/app/pages/Forum/ForumCategory.tsx fix message Co-authored-by: Theophile Sandoz --- packages/ui/src/app/pages/Forum/ForumCategory.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui/src/app/pages/Forum/ForumCategory.tsx b/packages/ui/src/app/pages/Forum/ForumCategory.tsx index cd5f70b233..968c0e4789 100644 --- a/packages/ui/src/app/pages/Forum/ForumCategory.tsx +++ b/packages/ui/src/app/pages/Forum/ForumCategory.tsx @@ -64,7 +64,7 @@ export const ForumCategory = () => { } if (hasError) { - return + return } if (!category) { From 1af8210e3ba1f4f25c39f856390acb57bba24c8c Mon Sep 17 00:00:00 2001 From: charli Date: Fri, 21 Apr 2023 16:59:13 +0200 Subject: [PATCH 7/7] fix --- packages/ui/src/app/pages/Forum/ForumCategory.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui/src/app/pages/Forum/ForumCategory.tsx b/packages/ui/src/app/pages/Forum/ForumCategory.tsx index cd5f70b233..05a2113bc6 100644 --- a/packages/ui/src/app/pages/Forum/ForumCategory.tsx +++ b/packages/ui/src/app/pages/Forum/ForumCategory.tsx @@ -64,7 +64,7 @@ export const ForumCategory = () => { } if (hasError) { - return + return } if (!category) {