diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useNavigateToNextRecordSingleRecordAction.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useNavigateToNextRecordSingleRecordAction.ts index 77a4f9acf..4e55d6315 100644 --- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useNavigateToNextRecordSingleRecordAction.ts +++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useNavigateToNextRecordSingleRecordAction.ts @@ -1,15 +1,19 @@ import { SingleRecordActionHookWithObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook'; +import { ActionMenuContext } from '@/action-menu/contexts/ActionMenuContext'; import { useRecordShowPagePagination } from '@/object-record/record-show/hooks/useRecordShowPagePagination'; +import { useContext } from 'react'; export const useNavigateToNextRecordSingleRecordAction: SingleRecordActionHookWithObjectMetadataItem = ({ recordId, objectMetadataItem }) => { + const { isInRightDrawer } = useContext(ActionMenuContext); + const { navigateToNextRecord } = useRecordShowPagePagination( objectMetadataItem.nameSingular, recordId, ); return { - shouldBeRegistered: true, + shouldBeRegistered: !isInRightDrawer, onClick: navigateToNextRecord, }; }; diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useNavigateToPreviousRecordSingleRecordAction.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useNavigateToPreviousRecordSingleRecordAction.ts index 25000420c..127cfa97a 100644 --- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useNavigateToPreviousRecordSingleRecordAction.ts +++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useNavigateToPreviousRecordSingleRecordAction.ts @@ -1,15 +1,18 @@ import { SingleRecordActionHookWithObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook'; +import { ActionMenuContext } from '@/action-menu/contexts/ActionMenuContext'; import { useRecordShowPagePagination } from '@/object-record/record-show/hooks/useRecordShowPagePagination'; +import { useContext } from 'react'; export const useNavigateToPreviousRecordSingleRecordAction: SingleRecordActionHookWithObjectMetadataItem = ({ recordId, objectMetadataItem }) => { + const { isInRightDrawer } = useContext(ActionMenuContext); const { navigateToPreviousRecord } = useRecordShowPagePagination( objectMetadataItem.nameSingular, recordId, ); return { - shouldBeRegistered: true, + shouldBeRegistered: !isInRightDrawer, onClick: navigateToPreviousRecord, }; }; diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerActionMenu.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerActionMenu.tsx index 5d335eb69..8eca1829b 100644 --- a/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerActionMenu.tsx +++ b/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerActionMenu.tsx @@ -21,7 +21,6 @@ export const RecordShowRightDrawerActionMenu = () => { {}, }} > diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx index d1002c89b..5e611f304 100644 --- a/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx +++ b/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx @@ -4,6 +4,8 @@ import { ShowPageContainer } from '@/ui/layout/page/components/ShowPageContainer import { MainContextStoreComponentInstanceIdSetterEffect } from '@/context-store/components/MainContextStoreComponentInstanceIdSetterEffect'; import { InformationBannerDeletedRecord } from '@/information-banner/components/deleted-record/InformationBannerDeletedRecord'; +import { ContextStoreCurrentViewTypeEffect } from '@/context-store/components/ContextStoreCurrentViewTypeEffect'; +import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType'; import { RecordShowContainerContextStoreObjectMetadataIdEffect } from '@/object-record/record-show/components/RecordShowContainerContextStoreObjectMetadataIdEffect'; import { RecordShowContainerContextStoreTargetedRecordsEffect } from '@/object-record/record-show/components/RecordShowContainerContextStoreTargetedRecordsEffect'; import { useRecordShowContainerData } from '@/object-record/record-show/hooks/useRecordShowContainerData'; @@ -51,6 +53,9 @@ export const RecordShowContainer = ({ + {!isInRightDrawer && } {recordFromStore && recordFromStore.deletedAt && ( { value={{ instanceId: `record-show-${objectRecordId}` }} > -