From e7870016245a43df183fea931f167bb8d12c010a Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Tue, 6 Aug 2024 18:21:53 +0530
Subject: [PATCH 1/3] [WEB-2182] fix: favorite item alignment and redirection
 (#5316)

* fix: favorite item alignment

* fix: favorite item redirection

* chore: code refactor
---
 .../sidebar/favorites/favorite-item.tsx       | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/web/core/components/workspace/sidebar/favorites/favorite-item.tsx b/web/core/components/workspace/sidebar/favorites/favorite-item.tsx
index 4ef38c8c26..79cd8dc563 100644
--- a/web/core/components/workspace/sidebar/favorites/favorite-item.tsx
+++ b/web/core/components/workspace/sidebar/favorites/favorite-item.tsx
@@ -135,7 +135,11 @@ export const FavoriteItem = observer(
           key={favorite.id}
           className={`${sidebarCollapsed ? "p-0 size-8 aspect-square justify-center mx-auto" : ""}`}
         >
-          <div className="flex flex-between items-center gap-1.5 py-[1px] w-full">
+          <div
+            className={cn("flex justify-between items-center gap-1.5 py-[1px]", {
+              "w-full": !sidebarCollapsed,
+            })}
+          >
             <Tooltip
               isMobile={isMobile}
               tooltipContent={favorite.sort_order === null ? "Join the project to rearrange" : "Drag to rearrange"}
@@ -158,13 +162,14 @@ export const FavoriteItem = observer(
               </button>
             </Tooltip>
 
-            {getIcon()}
-
-            {!sidebarCollapsed && (
-              <Link href={getLink()} className="text-sm leading-5 font-medium flex-1 truncate">
-                {favorite.entity_data ? favorite.entity_data.name : favorite.name}
-              </Link>
-            )}
+            <Link href={getLink()} className="flex items-center gap-1.5 truncate">
+              {getIcon()}
+              {!sidebarCollapsed && (
+                <span className="text-sm leading-5 font-medium flex-1 truncate">
+                  {favorite.entity_data ? favorite.entity_data.name : favorite.name}
+                </span>
+              )}
+            </Link>
 
             {!sidebarCollapsed && (
               <CustomMenu

From b9a186a5f6c5cb49c4ca8f4c28fa1ffacfc97afe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Aug 2024 20:18:05 +0530
Subject: [PATCH 2/3] chore(deps): bump django in /apiserver/requirements
 (#5337)

Bumps [django](https://github.com/django/django) from 4.2.14 to 4.2.15.
- [Commits](https://github.com/django/django/compare/4.2.14...4.2.15)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 apiserver/requirements/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apiserver/requirements/base.txt b/apiserver/requirements/base.txt
index 154b09925a..df34c6cf21 100644
--- a/apiserver/requirements/base.txt
+++ b/apiserver/requirements/base.txt
@@ -1,7 +1,7 @@
 # base requirements
 
 # django
-Django==4.2.14
+Django==4.2.15
 # rest framework
 djangorestframework==3.15.2
 # postgres 

From 72504640719c01713eddb3e5c8f78aaf8f060959 Mon Sep 17 00:00:00 2001
From: sriram veeraghanta <veeraghanta.sriram@gmail.com>
Date: Thu, 8 Aug 2024 20:28:45 +0530
Subject: [PATCH 3/3] fix: update the runtime python version

---
 apiserver/runtime.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apiserver/runtime.txt b/apiserver/runtime.txt
index 7f3d94a001..14a2d259b0 100644
--- a/apiserver/runtime.txt
+++ b/apiserver/runtime.txt
@@ -1 +1 @@
-python-3.12.4
\ No newline at end of file
+python-3.12.5
\ No newline at end of file