From 4be94adaca41c66796012d085145f55d201c954e Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Tue, 1 Apr 2025 20:47:01 +0530
Subject: [PATCH] [WEB-2597] fix: handle favorite entity data causing
 application error (#6853)

---
 .../sidebar/favorites/favorites-menu.tsx      | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/web/core/components/workspace/sidebar/favorites/favorites-menu.tsx b/web/core/components/workspace/sidebar/favorites/favorites-menu.tsx
index bfd08056d..2beed74f6 100644
--- a/web/core/components/workspace/sidebar/favorites/favorites-menu.tsx
+++ b/web/core/components/workspace/sidebar/favorites/favorites-menu.tsx
@@ -252,33 +252,37 @@ export const SidebarFavoritesMenu = observer(() => {
                 orderBy(Object.values(groupedFavorites), "sequence", "desc")
                   .filter((fav) => !fav.parent)
                   .map((fav, index, { length }) => (
-                    <Tooltip
-                      key={fav.id}
-                      tooltipContent={fav?.entity_data ? fav.entity_data?.name : fav?.name}
-                      position="right"
-                      className="ml-2"
-                      disabled={!sidebarCollapsed}
-                      isMobile={isMobile}
-                    >
-                      {fav.is_folder ? (
-                        <FavoriteFolder
-                          favorite={fav}
-                          isLastChild={index === length - 1}
-                          handleRemoveFromFavorites={handleRemoveFromFavorites}
-                          handleRemoveFromFavoritesFolder={handleRemoveFromFavoritesFolder}
-                          handleDrop={handleDrop}
-                        />
-                      ) : (
-                        <FavoriteRoot
-                          workspaceSlug={workspaceSlug.toString()}
-                          favorite={fav}
-                          isLastChild={index === length - 1}
-                          parentId={undefined}
-                          handleRemoveFromFavorites={handleRemoveFromFavorites}
-                          handleDrop={handleDrop}
-                        />
+                    <>
+                      {fav?.id && (
+                        <Tooltip
+                          key={fav?.id}
+                          tooltipContent={fav?.entity_data ? fav?.entity_data?.name : fav?.name}
+                          position="right"
+                          className="ml-2"
+                          disabled={!sidebarCollapsed}
+                          isMobile={isMobile}
+                        >
+                          {fav?.is_folder ? (
+                            <FavoriteFolder
+                              favorite={fav}
+                              isLastChild={index === length - 1}
+                              handleRemoveFromFavorites={handleRemoveFromFavorites}
+                              handleRemoveFromFavoritesFolder={handleRemoveFromFavoritesFolder}
+                              handleDrop={handleDrop}
+                            />
+                          ) : (
+                            <FavoriteRoot
+                              workspaceSlug={workspaceSlug.toString()}
+                              favorite={fav}
+                              isLastChild={index === length - 1}
+                              parentId={undefined}
+                              handleRemoveFromFavorites={handleRemoveFromFavorites}
+                              handleDrop={handleDrop}
+                            />
+                          )}
+                        </Tooltip>
                       )}
-                    </Tooltip>
+                    </>
                   ))
               )}
             </Disclosure.Panel>