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

Fix activity (#11015)

Browse Source 
Deprecating unused states and making sure that the ActivityRichText
editor loads when activity.bodyV2 is present
This commit is contained in:
Charles Bochet
2025-03-19 10:45:11 +01:00
committed by GitHub
parent 117a961622
commit ca9c070945
20 changed files with 46 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/twenty-front/src/modules/command-menu/pages/record-page/components/CommandMenuRecordPage.tsx
View File

@ -1,6 +1,5 @@
import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
import { TimelineActivityContext } from '@/activities/timeline-activities/contexts/TimelineActivityContext';
import { isNewViewableRecordLoadingComponentState } from '@/command-menu/pages/record-page/states/isNewViewableRecordLoadingComponentState';
import { viewableRecordIdComponentState } from '@/command-menu/pages/record-page/states/viewableRecordIdComponentState';
import { viewableRecordNameSingularComponentState } from '@/command-menu/pages/record-page/states/viewableRecordNameSingularComponentState';
import { CommandMenuPageComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuPageComponentInstanceContext';
@ -29,14 +28,12 @@ export const CommandMenuRecordPage = () => {
const viewableRecordNameSingular = useRecoilComponentValueV2(
viewableRecordNameSingularComponentState,
);
const isNewViewableRecordLoading = useRecoilComponentValueV2(
isNewViewableRecordLoadingComponentState,
);
const viewableRecordId = useRecoilComponentValueV2(
viewableRecordIdComponentState,
);
if (!viewableRecordNameSingular && !isNewViewableRecordLoading) {
if (!viewableRecordNameSingular) {
throw new Error(`Object name is not defined`);
}
@ -73,9 +70,7 @@ export const CommandMenuRecordPage = () => {
>
<StyledRightDrawerRecord isMobile={isMobile}>
<RecordFieldValueSelectorContextProvider>
{!isNewViewableRecordLoading && (
<RecordValueSetterEffect recordId={objectRecordId} />
)}
<RecordValueSetterEffect recordId={objectRecordId} />
<TimelineActivityContext.Provider
value={{
recordId: objectRecordId,
@ -90,7 +85,6 @@ export const CommandMenuRecordPage = () => {
objectRecordId={objectRecordId}
loading={false}
isInRightDrawer={true}
isNewRightDrawerItemLoading={isNewViewableRecordLoading}
/>
</TimelineActivityContext.Provider>
</RecordFieldValueSelectorContextProvider>

9
packages/twenty-front/src/modules/command-menu/pages/record-page/states/isNewViewableRecordLoadingComponentState.ts
View File

@ -1,9 +0,0 @@
import { CommandMenuPageComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuPageComponentInstanceContext';
import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
export const isNewViewableRecordLoadingComponentState =
createComponentStateV2<boolean>({
key: 'command-menu/is-new-viewable-record-loading',
defaultValue: false,
componentInstanceContext: CommandMenuPageComponentInstanceContext,
});