diff --git a/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx b/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx index 148d738c016..eba97e1ec54 100644 --- a/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx +++ b/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx @@ -25,18 +25,10 @@ const ProfileActivity = () => { const router = useRouter(); const { workspaceSlug } = router.query; - const { data: userActivity } = useSWR(USER_ACTIVITY, () => userService.getUserActivity()); - - if (!userActivity) { - return ( - - - - - - - ); - } + const { data: userActivity } = useSWR( + workspaceSlug ? USER_ACTIVITY : null, + workspaceSlug ? () => userService.getUserActivity(workspaceSlug.toString()) : null + ); return ( { - {userActivity && userActivity.results.length > 0 && ( + {userActivity ? (
    {userActivity.results.map((activityItem: any, activityIdx: number) => { @@ -226,6 +218,13 @@ const ProfileActivity = () => { })}
+ ) : ( + + + + + + )}
diff --git a/apps/app/services/user.service.ts b/apps/app/services/user.service.ts index 98eea527881..0e5def647bd 100644 --- a/apps/app/services/user.service.ts +++ b/apps/app/services/user.service.ts @@ -101,8 +101,8 @@ class UserService extends APIService { }); } - async getUserActivity(): Promise { - return this.get("/api/users/activities/") + async getUserWorkspaceActivity(workspaceSlug: string): Promise { + return this.get(`/api/users/workspaces/${workspaceSlug}/activities/`) .then((response) => response?.data) .catch((error) => { throw error?.response?.data;