admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix activity editor (#9165)

Browse Source
This commit is contained in:
Charles Bochet
2024-12-20 11:52:00 +01:00
committed by GitHub
parent 0d2bfad3c9
commit f499c728fd
5 changed files with 88 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageActivityContainer.tsx
View File

@ -1,4 +1,4 @@
import { RichTextEditor } from '@/activities/components/RichTextEditor';
import { ActivityRichTextEditor } from '@/activities/components/ActivityRichTextEditor';
import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
import { isNewViewableRecordLoadingState } from '@/object-record/record-right-drawer/states/isNewViewableRecordLoading';
@ -28,9 +28,8 @@ export const ShowPageActivityContainer = ({
componentInstanceId={`scroll-wrapper-tab-list-${targetableObject.id}`}
>
<StyledShowPageActivityContainer>
<RichTextEditor
<ActivityRichTextEditor
activityId={targetableObject.id}
fillTitleFromBody={false}
activityObjectNameSingular={
targetableObject.targetObjectNameSingular as
| CoreObjectNameSingular.Note

4
packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageSubContainer.tsx
View File

@ -65,7 +65,7 @@ export const ShowPageSubContainer = ({
isNewRightDrawerItemLoading = false,
}: ShowPageSubContainerProps) => {
const { activeTabId } = useTabList(
`${TAB_LIST_COMPONENT_ID}-${isInRightDrawer}`,
`${TAB_LIST_COMPONENT_ID}-${isInRightDrawer}-${targetableObject.id}`,
);
const isMobile = useIsMobile();
@ -128,7 +128,7 @@ export const ShowPageSubContainer = ({
<TabList
behaveAsLinks={!isInRightDrawer}
loading={loading || isNewViewableRecordLoading}
tabListInstanceId={`${TAB_LIST_COMPONENT_ID}-${isInRightDrawer}`}
tabListInstanceId={`${TAB_LIST_COMPONENT_ID}-${isInRightDrawer}-${targetableObject.id}`}
tabs={tabs}
/>
</StyledTabListContainer>