From 86a823f3dc94c2d13654a79c3a874b69be2ba61c Mon Sep 17 00:00:00 2001
From: Po Chun Chiu <57251712+EiffelFly@users.noreply.github.com>
Date: Wed, 7 Feb 2024 17:54:12 +0800
Subject: [PATCH] fix: fix not redirect non exist user page to 404 (#941)

Because

- We should re-direct non exist view to 404

This commit

- fix not redirect non exist user page to 404
---
 packages/toolkit/src/lib/useEntity.ts               | 13 ++++++++-----
 .../profile/user-profile-view/UserProfileView.tsx   |  6 +++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/toolkit/src/lib/useEntity.ts b/packages/toolkit/src/lib/useEntity.ts
index 6b4bd6126..a031ff84d 100644
--- a/packages/toolkit/src/lib/useEntity.ts
+++ b/packages/toolkit/src/lib/useEntity.ts
@@ -86,15 +86,18 @@ export function useEntity(): UseEntitySuccessReturn | UseEntityFailedReturn {
   }, [entity, namespaceType.isSuccess, namespaceType.data]);
 
   React.useEffect(() => {
+    if (!namespaceType.isSuccess) return;
+
     if (
-      entityName &&
-      pipelineName &&
-      connectorName &&
-      modelName &&
-      namespaceType.isSuccess
+      namespaceType.data === "NAMESPACE_RESERVED" ||
+      namespaceType.data === "NAMESPACE_AVAILABLE"
     ) {
       setIsSuccess(true);
     }
+
+    if (entityName && pipelineName && connectorName && modelName) {
+      setIsSuccess(true);
+    }
   }, [
     entityName,
     pipelineName,
diff --git a/packages/toolkit/src/view/profile/user-profile-view/UserProfileView.tsx b/packages/toolkit/src/view/profile/user-profile-view/UserProfileView.tsx
index e63def8ad..cc7e5d90e 100644
--- a/packages/toolkit/src/view/profile/user-profile-view/UserProfileView.tsx
+++ b/packages/toolkit/src/view/profile/user-profile-view/UserProfileView.tsx
@@ -33,7 +33,11 @@ export const UserProfileView = () => {
   const user = useUser({
     userName: entityObject.entityName,
     accessToken: accessToken,
-    enabled: enabledQuery && entityObject.isSuccess,
+    enabled:
+      enabledQuery &&
+      entityObject.isSuccess &&
+      (entityObject.namespaceType === "NAMESPACE_ORGANIZATION" ||
+        entityObject.namespaceType === "NAMESPACE_USER"),
   });
 
   const pipelines = useUserPipelines({