From ddb833e9a152131f70a17324ae1c6640fe48f3ae Mon Sep 17 00:00:00 2001 From: Stephen Zhou Date: Fri, 20 Mar 2026 11:01:31 +0800 Subject: [PATCH] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- web/app/(commonLayout)/datasets/layout.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/app/(commonLayout)/datasets/layout.tsx b/web/app/(commonLayout)/datasets/layout.tsx index ca70870b15..993f6ab1dd 100644 --- a/web/app/(commonLayout)/datasets/layout.tsx +++ b/web/app/(commonLayout)/datasets/layout.tsx @@ -9,16 +9,15 @@ import { useRouter } from '@/next/navigation' export default function DatasetsLayout({ children }: { children: React.ReactNode }) { const { isCurrentWorkspaceEditor, isCurrentWorkspaceDatasetOperator, currentWorkspace, isLoadingCurrentWorkspace } = useAppContext() const router = useRouter() - const shouldRedirect = !isLoadingCurrentWorkspace - && currentWorkspace.id - && !(isCurrentWorkspaceEditor || isCurrentWorkspaceDatasetOperator) + const isWorkspaceReady = !isLoadingCurrentWorkspace && !!currentWorkspace.id + const shouldRedirect = isWorkspaceReady && !(isCurrentWorkspaceEditor || isCurrentWorkspaceDatasetOperator) useEffect(() => { if (shouldRedirect) router.replace('/apps') }, [shouldRedirect, router]) - if (shouldRedirect) { + if (!isWorkspaceReady || shouldRedirect) { return null }