From 485e56bcdfc630d8bf8dce2bd28beea55d8cffbf Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 28 Aug 2023 13:29:48 +0530
Subject: [PATCH] fix: my profile activity endpoint (#1983)

* fix: my profile activity endpoint

* chore: update service name
---
 .../[workspaceSlug]/me/profile/activity.tsx   | 25 +++++++++----------
 apps/app/services/user.service.ts             |  4 +--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx b/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx
index 148d738c0..eba97e1ec 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 (
-      <Loader className="space-y-5">
-        <Loader.Item height="40px" />
-        <Loader.Item height="40px" />
-        <Loader.Item height="40px" />
-        <Loader.Item height="40px" />
-      </Loader>
-    );
-  }
+  const { data: userActivity } = useSWR(
+    workspaceSlug ? USER_ACTIVITY : null,
+    workspaceSlug ? () => userService.getUserActivity(workspaceSlug.toString()) : null
+  );
 
   return (
     <WorkspaceAuthorizationLayout
@@ -56,7 +48,7 @@ const ProfileActivity = () => {
           </div>
           <SettingsNavbar profilePage />
         </div>
-        {userActivity && userActivity.results.length > 0 && (
+        {userActivity ? (
           <div>
             <ul role="list" className="-mb-4">
               {userActivity.results.map((activityItem: any, activityIdx: number) => {
@@ -226,6 +218,13 @@ const ProfileActivity = () => {
               })}
             </ul>
           </div>
+        ) : (
+          <Loader className="space-y-5">
+            <Loader.Item height="40px" />
+            <Loader.Item height="40px" />
+            <Loader.Item height="40px" />
+            <Loader.Item height="40px" />
+          </Loader>
         )}
       </div>
     </WorkspaceAuthorizationLayout>
diff --git a/apps/app/services/user.service.ts b/apps/app/services/user.service.ts
index 98eea5278..0e5def647 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<IUserActivityResponse> {
-    return this.get("/api/users/activities/")
+  async getUserWorkspaceActivity(workspaceSlug: string): Promise<IUserActivityResponse> {
+    return this.get(`/api/users/workspaces/${workspaceSlug}/activities/`)
       .then((response) => response?.data)
       .catch((error) => {
         throw error?.response?.data;