From 406ffcd7dec75362eccd55694f6d42744e780751 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:09:10 +0530
Subject: [PATCH] [WEB-2358] fix: recent collaborators (#5532)

* fix: recent collaborators

* fix: recent collaborators loader
---
 .../recent-collaborators/collaborators-list.tsx | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/web/core/components/dashboard/widgets/recent-collaborators/collaborators-list.tsx b/web/core/components/dashboard/widgets/recent-collaborators/collaborators-list.tsx
index bf7b6ac7d4..775980e177 100644
--- a/web/core/components/dashboard/widgets/recent-collaborators/collaborators-list.tsx
+++ b/web/core/components/dashboard/widgets/recent-collaborators/collaborators-list.tsx
@@ -78,12 +78,17 @@ export const CollaboratorsList: React.FC<CollaboratorsListProps> = (props) => {
     data: TRecentCollaboratorsWidgetResponse[] | undefined;
   };
 
-  if (!widgetStats) return <WidgetLoader widgetKey={WIDGET_KEY} />;
+  if (!widgetStats)
+    return (
+      <div className="mt-7 mb-6 grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-6 xl:grid-cols-8 gap-2 gap-y-8">
+        <WidgetLoader widgetKey={WIDGET_KEY} />
+      </div>
+    );
 
-  const sortedStats = sortBy(widgetStats, [(user) => user.user_id !== currentUser?.id]);
+  const sortedStats = sortBy(widgetStats, [(user) => user?.user_id !== currentUser?.id]);
 
   const filteredStats = sortedStats.filter((user) => {
-    const { display_name, first_name, last_name } = getUserDetails(user.user_id) || {};
+    const { display_name, first_name, last_name } = getUserDetails(user?.user_id) || {};
 
     const searchLower = searchQuery.toLowerCase();
     return (
@@ -97,9 +102,9 @@ export const CollaboratorsList: React.FC<CollaboratorsListProps> = (props) => {
     <div className="mt-7 mb-6 grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-6 xl:grid-cols-8 gap-2 gap-y-8">
       {filteredStats?.map((user) => (
         <CollaboratorListItem
-          key={user.user_id}
-          issueCount={user.active_issue_count}
-          userId={user.user_id}
+          key={user?.user_id}
+          issueCount={user?.active_issue_count}
+          userId={user?.user_id}
           workspaceSlug={workspaceSlug}
         />
       ))}