Fix right drawer actions (#9241)
https://github.com/user-attachments/assets/107e6058-633f-4caa-967c-7017bef75d52
This commit is contained in:
@ -1,15 +1,19 @@
|
|||||||
import { SingleRecordActionHookWithObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook';
|
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 { useRecordShowPagePagination } from '@/object-record/record-show/hooks/useRecordShowPagePagination';
|
||||||
|
import { useContext } from 'react';
|
||||||
|
|
||||||
export const useNavigateToNextRecordSingleRecordAction: SingleRecordActionHookWithObjectMetadataItem =
|
export const useNavigateToNextRecordSingleRecordAction: SingleRecordActionHookWithObjectMetadataItem =
|
||||||
({ recordId, objectMetadataItem }) => {
|
({ recordId, objectMetadataItem }) => {
|
||||||
|
const { isInRightDrawer } = useContext(ActionMenuContext);
|
||||||
|
|
||||||
const { navigateToNextRecord } = useRecordShowPagePagination(
|
const { navigateToNextRecord } = useRecordShowPagePagination(
|
||||||
objectMetadataItem.nameSingular,
|
objectMetadataItem.nameSingular,
|
||||||
recordId,
|
recordId,
|
||||||
);
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
shouldBeRegistered: true,
|
shouldBeRegistered: !isInRightDrawer,
|
||||||
onClick: navigateToNextRecord,
|
onClick: navigateToNextRecord,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,15 +1,18 @@
|
|||||||
import { SingleRecordActionHookWithObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook';
|
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 { useRecordShowPagePagination } from '@/object-record/record-show/hooks/useRecordShowPagePagination';
|
||||||
|
import { useContext } from 'react';
|
||||||
|
|
||||||
export const useNavigateToPreviousRecordSingleRecordAction: SingleRecordActionHookWithObjectMetadataItem =
|
export const useNavigateToPreviousRecordSingleRecordAction: SingleRecordActionHookWithObjectMetadataItem =
|
||||||
({ recordId, objectMetadataItem }) => {
|
({ recordId, objectMetadataItem }) => {
|
||||||
|
const { isInRightDrawer } = useContext(ActionMenuContext);
|
||||||
const { navigateToPreviousRecord } = useRecordShowPagePagination(
|
const { navigateToPreviousRecord } = useRecordShowPagePagination(
|
||||||
objectMetadataItem.nameSingular,
|
objectMetadataItem.nameSingular,
|
||||||
recordId,
|
recordId,
|
||||||
);
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
shouldBeRegistered: true,
|
shouldBeRegistered: !isInRightDrawer,
|
||||||
onClick: navigateToPreviousRecord,
|
onClick: navigateToPreviousRecord,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@ -21,7 +21,6 @@ export const RecordShowRightDrawerActionMenu = () => {
|
|||||||
<ActionMenuContext.Provider
|
<ActionMenuContext.Provider
|
||||||
value={{
|
value={{
|
||||||
isInRightDrawer: true,
|
isInRightDrawer: true,
|
||||||
onActionExecutedCallback: () => {},
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<RightDrawerActionMenuDropdown />
|
<RightDrawerActionMenuDropdown />
|
||||||
|
|||||||
@ -4,6 +4,8 @@ import { ShowPageContainer } from '@/ui/layout/page/components/ShowPageContainer
|
|||||||
import { MainContextStoreComponentInstanceIdSetterEffect } from '@/context-store/components/MainContextStoreComponentInstanceIdSetterEffect';
|
import { MainContextStoreComponentInstanceIdSetterEffect } from '@/context-store/components/MainContextStoreComponentInstanceIdSetterEffect';
|
||||||
import { InformationBannerDeletedRecord } from '@/information-banner/components/deleted-record/InformationBannerDeletedRecord';
|
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 { RecordShowContainerContextStoreObjectMetadataIdEffect } from '@/object-record/record-show/components/RecordShowContainerContextStoreObjectMetadataIdEffect';
|
||||||
import { RecordShowContainerContextStoreTargetedRecordsEffect } from '@/object-record/record-show/components/RecordShowContainerContextStoreTargetedRecordsEffect';
|
import { RecordShowContainerContextStoreTargetedRecordsEffect } from '@/object-record/record-show/components/RecordShowContainerContextStoreTargetedRecordsEffect';
|
||||||
import { useRecordShowContainerData } from '@/object-record/record-show/hooks/useRecordShowContainerData';
|
import { useRecordShowContainerData } from '@/object-record/record-show/hooks/useRecordShowContainerData';
|
||||||
@ -51,6 +53,9 @@ export const RecordShowContainer = ({
|
|||||||
<RecordShowContainerContextStoreTargetedRecordsEffect
|
<RecordShowContainerContextStoreTargetedRecordsEffect
|
||||||
recordId={objectRecordId}
|
recordId={objectRecordId}
|
||||||
/>
|
/>
|
||||||
|
<ContextStoreCurrentViewTypeEffect
|
||||||
|
viewType={ContextStoreViewType.ShowPage}
|
||||||
|
/>
|
||||||
{!isInRightDrawer && <MainContextStoreComponentInstanceIdSetterEffect />}
|
{!isInRightDrawer && <MainContextStoreComponentInstanceIdSetterEffect />}
|
||||||
{recordFromStore && recordFromStore.deletedAt && (
|
{recordFromStore && recordFromStore.deletedAt && (
|
||||||
<InformationBannerDeletedRecord
|
<InformationBannerDeletedRecord
|
||||||
|
|||||||
@ -3,9 +3,7 @@ import { useParams } from 'react-router-dom';
|
|||||||
import { RecordShowActionMenu } from '@/action-menu/components/RecordShowActionMenu';
|
import { RecordShowActionMenu } from '@/action-menu/components/RecordShowActionMenu';
|
||||||
import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
|
import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
|
||||||
import { TimelineActivityContext } from '@/activities/timeline-activities/contexts/TimelineActivityContext';
|
import { TimelineActivityContext } from '@/activities/timeline-activities/contexts/TimelineActivityContext';
|
||||||
import { ContextStoreCurrentViewTypeEffect } from '@/context-store/components/ContextStoreCurrentViewTypeEffect';
|
|
||||||
import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
|
import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
|
||||||
import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType';
|
|
||||||
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
|
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
|
||||||
import { RecordShowContainer } from '@/object-record/record-show/components/RecordShowContainer';
|
import { RecordShowContainer } from '@/object-record/record-show/components/RecordShowContainer';
|
||||||
import { useRecordShowPage } from '@/object-record/record-show/hooks/useRecordShowPage';
|
import { useRecordShowPage } from '@/object-record/record-show/hooks/useRecordShowPage';
|
||||||
@ -56,9 +54,6 @@ export const RecordShowPage = () => {
|
|||||||
value={{ instanceId: `record-show-${objectRecordId}` }}
|
value={{ instanceId: `record-show-${objectRecordId}` }}
|
||||||
>
|
>
|
||||||
<RecordValueSetterEffect recordId={objectRecordId} />
|
<RecordValueSetterEffect recordId={objectRecordId} />
|
||||||
<ContextStoreCurrentViewTypeEffect
|
|
||||||
viewType={ContextStoreViewType.ShowPage}
|
|
||||||
/>
|
|
||||||
<PageContainer>
|
<PageContainer>
|
||||||
<PageTitle title={pageTitle} />
|
<PageTitle title={pageTitle} />
|
||||||
<RecordShowPageHeader
|
<RecordShowPageHeader
|
||||||
|
|||||||
Reference in New Issue
Block a user