Fix activity (#11015)
Deprecating unused states and making sure that the ActivityRichText editor loads when activity.bodyV2 is present
This commit is contained in:
@ -151,7 +151,10 @@ export const ActivityRichTextEditor = ({
|
||||
return {
|
||||
...oldActivity,
|
||||
id: activityId,
|
||||
body: newStringifiedBody,
|
||||
bodyV2: {
|
||||
blocknote: newStringifiedBody,
|
||||
markdown: null,
|
||||
},
|
||||
__typename: 'Activity',
|
||||
};
|
||||
});
|
||||
@ -159,8 +162,11 @@ export const ActivityRichTextEditor = ({
|
||||
modifyRecordFromCache({
|
||||
recordId: activityId,
|
||||
fieldModifiers: {
|
||||
body: () => {
|
||||
return newStringifiedBody;
|
||||
bodyV2: () => {
|
||||
return {
|
||||
blocknote: newStringifiedBody,
|
||||
markdown: null,
|
||||
};
|
||||
},
|
||||
},
|
||||
cache,
|
||||
|
||||
@ -14,7 +14,6 @@ import { Task } from '@/activities/types/Task';
|
||||
import { TaskTarget } from '@/activities/types/TaskTarget';
|
||||
import { useOpenRecordInCommandMenu } from '@/command-menu/hooks/useOpenRecordInCommandMenu';
|
||||
import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
|
||||
import { isNewViewableRecordLoadingState } from '@/object-record/record-right-drawer/states/isNewViewableRecordLoading';
|
||||
|
||||
export const useOpenCreateActivityDrawer = ({
|
||||
activityObjectNameSingular,
|
||||
@ -46,9 +45,7 @@ export const useOpenCreateActivityDrawer = ({
|
||||
const setViewableRecordNameSingular = useSetRecoilState(
|
||||
viewableRecordNameSingularState,
|
||||
);
|
||||
const setIsNewViewableRecordLoading = useSetRecoilState(
|
||||
isNewViewableRecordLoadingState,
|
||||
);
|
||||
|
||||
const setIsUpsertingActivityInDB = useSetRecoilState(
|
||||
isUpsertingActivityInDBState,
|
||||
);
|
||||
@ -62,7 +59,6 @@ export const useOpenCreateActivityDrawer = ({
|
||||
targetableObjects: ActivityTargetableObject[];
|
||||
customAssignee?: WorkspaceMember;
|
||||
}) => {
|
||||
setIsNewViewableRecordLoading(true);
|
||||
setViewableRecordId(null);
|
||||
setViewableRecordNameSingular(activityObjectNameSingular);
|
||||
|
||||
@ -113,7 +109,6 @@ export const useOpenCreateActivityDrawer = ({
|
||||
setViewableRecordId(activity.id);
|
||||
|
||||
setIsUpsertingActivityInDB(false);
|
||||
setIsNewViewableRecordLoading(false);
|
||||
};
|
||||
|
||||
return openCreateActivityDrawer;
|
||||
|
||||
@ -10,7 +10,6 @@ const task: Task = {
|
||||
id: '123',
|
||||
status: 'DONE',
|
||||
title: 'Test',
|
||||
body: 'Test',
|
||||
bodyV2: {
|
||||
blocknote: 'Test',
|
||||
markdown: 'Test',
|
||||
|
||||
@ -3,7 +3,6 @@ export type Activity = {
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
title: string;
|
||||
body: string | null;
|
||||
bodyV2?: {
|
||||
blocknote: string | null;
|
||||
markdown: string | null;
|
||||
|
||||
Reference in New Issue
Block a user