From 8772f8aac7c38faaaae0f39fc04a6e4b13390dd6 Mon Sep 17 00:00:00 2001
From: chaeyeon <111040042+yeonicy@users.noreply.github.com>
Date: Thu, 21 Nov 2024 04:33:54 +0900
Subject: [PATCH] Hide the "Expand to Full Page" button on Email and Calendar
 pages  (#8615)

### Overview
This pull request addresses issue #8612 by ensuring the "Expand to Full
Page" button does not appear on the Email and Calendar pages in the
right drawer.

### Changes Made
- Added conditions in the `RightDrawerTopBar` component to prevent the
`RightDrawerTopBarExpandButton` from rendering on:
  - Email pages (`RightDrawerPages.ViewEmailThread`)
  - Calendar pages (`RightDrawerPages.ViewCalendarEvent`)
- Verified that the button still renders correctly on other pages, such
as Record pages.

### Testing
Since I couldn't run the project locally, I was unable to confirm the
changes in a running environment. However, the logic has been carefully
updated to ensure the button is conditionally hidden based on the
current `rightDrawerPage` state.

### Additional Notes
Please let me know if further adjustments are needed or if there are any
issues during testing. Thank you for reviewing this PR!

---------

Co-authored-by: Weiko <corentin@twenty.com>
---
 .../components/RightDrawerTopBar.tsx          | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBar.tsx b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBar.tsx
index b80b943e1..2a5945c5b 100644
--- a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBar.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawerTopBar.tsx
@@ -85,13 +85,14 @@ export const RightDrawerTopBar = () => {
 
   const ObjectIcon = getIcon(objectMetadataItem.icon);
 
-  const label =
-    rightDrawerPage === RightDrawerPages.ViewRecord
-      ? objectMetadataItem.labelSingular
-      : RIGHT_DRAWER_PAGE_TITLES[rightDrawerPage];
+  const isViewRecordRightDrawerPage =
+    rightDrawerPage === RightDrawerPages.ViewRecord;
 
-  const Icon =
-    rightDrawerPage === RightDrawerPages.ViewRecord ? ObjectIcon : PageIcon;
+  const label = isViewRecordRightDrawerPage
+    ? objectMetadataItem.labelSingular
+    : RIGHT_DRAWER_PAGE_TITLES[rightDrawerPage];
+
+  const Icon = isViewRecordRightDrawerPage ? ObjectIcon : PageIcon;
 
   return (
     <StyledRightDrawerTopBar
@@ -122,15 +123,18 @@ export const RightDrawerTopBar = () => {
           <RightDrawerTopBarMinimizeButton />
         )}
 
-        {!isMobile && !isRightDrawerMinimized && (
-          <RightDrawerTopBarExpandButton
-            to={
-              getBasePathToShowPage({
-                objectNameSingular: viewableRecordNameSingular ?? '',
-              }) + viewableRecordId
-            }
-          />
-        )}
+        {!isMobile &&
+          !isRightDrawerMinimized &&
+          isViewRecordRightDrawerPage && (
+            <RightDrawerTopBarExpandButton
+              to={
+                getBasePathToShowPage({
+                  objectNameSingular: viewableRecordNameSingular ?? '',
+                }) + viewableRecordId
+              }
+            />
+          )}
+
         <RightDrawerTopBarCloseButton />
       </StyledTopBarWrapper>
     </StyledRightDrawerTopBar>