mirror of
https://github.com/lingble/twenty.git
synced 2025-10-29 20:02:29 +00:00
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>
This commit is contained in:
@@ -85,13 +85,14 @@ export const RightDrawerTopBar = () => {
|
|||||||
|
|
||||||
const ObjectIcon = getIcon(objectMetadataItem.icon);
|
const ObjectIcon = getIcon(objectMetadataItem.icon);
|
||||||
|
|
||||||
const label =
|
const isViewRecordRightDrawerPage =
|
||||||
rightDrawerPage === RightDrawerPages.ViewRecord
|
rightDrawerPage === RightDrawerPages.ViewRecord;
|
||||||
? objectMetadataItem.labelSingular
|
|
||||||
: RIGHT_DRAWER_PAGE_TITLES[rightDrawerPage];
|
|
||||||
|
|
||||||
const Icon =
|
const label = isViewRecordRightDrawerPage
|
||||||
rightDrawerPage === RightDrawerPages.ViewRecord ? ObjectIcon : PageIcon;
|
? objectMetadataItem.labelSingular
|
||||||
|
: RIGHT_DRAWER_PAGE_TITLES[rightDrawerPage];
|
||||||
|
|
||||||
|
const Icon = isViewRecordRightDrawerPage ? ObjectIcon : PageIcon;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<StyledRightDrawerTopBar
|
<StyledRightDrawerTopBar
|
||||||
@@ -122,15 +123,18 @@ export const RightDrawerTopBar = () => {
|
|||||||
<RightDrawerTopBarMinimizeButton />
|
<RightDrawerTopBarMinimizeButton />
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{!isMobile && !isRightDrawerMinimized && (
|
{!isMobile &&
|
||||||
<RightDrawerTopBarExpandButton
|
!isRightDrawerMinimized &&
|
||||||
to={
|
isViewRecordRightDrawerPage && (
|
||||||
getBasePathToShowPage({
|
<RightDrawerTopBarExpandButton
|
||||||
objectNameSingular: viewableRecordNameSingular ?? '',
|
to={
|
||||||
}) + viewableRecordId
|
getBasePathToShowPage({
|
||||||
}
|
objectNameSingular: viewableRecordNameSingular ?? '',
|
||||||
/>
|
}) + viewableRecordId
|
||||||
)}
|
}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
<RightDrawerTopBarCloseButton />
|
<RightDrawerTopBarCloseButton />
|
||||||
</StyledTopBarWrapper>
|
</StyledTopBarWrapper>
|
||||||
</StyledRightDrawerTopBar>
|
</StyledRightDrawerTopBar>
|
||||||
|
|||||||
Reference in New Issue
Block a user