Skip to content

Commit

Permalink
Fast follows on new task/note behaviors (twentyhq#6477)
Browse files Browse the repository at this point in the history
In this PR, I'm fixing two issues that we have faced:
- computing a rich text first line in case of the first block content is
not a text
- migrating existing timelineActivities tied to tasks / notes to
linked-tasks / linked-notes during migration command
  • Loading branch information
charlesBochet authored Jul 31, 2024
1 parent ff74623 commit ae7821c
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,21 @@ export const getFirstNonEmptyLineOfRichText = (
}
for (const node of fieldValue) {
if (!isUndefinedOrNull(node.content)) {
const contentArray = node.content as Array<{ text: string }>;
const contentArray = node.content as Array<
{ text: string } | { link: string }
>;
if (contentArray.length > 0) {
for (const content of contentArray) {
if (content.text?.trim() !== '') {
return content.text;
if ('link' in content) {
return content.link;
}
if ('text' in content) {
return content.text.trim();
}
}
}
}
}

return '';
};
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,25 @@ export class UpdateActivitiesCommand extends CommandRunner {

await timelineActivityRepository.update(
{
name: 'note.created',
linkedObjectMetadataId: activityObjectMetadataId,
linkedRecordId: activity.id,
},
{
linkedObjectMetadataId: noteObjectMetadataId,
name: 'linked-note.created',
},
);

await timelineActivityRepository.update(
{
name: 'note.updated',
linkedObjectMetadataId: activityObjectMetadataId,
linkedRecordId: activity.id,
},
{
linkedObjectMetadataId: noteObjectMetadataId,
name: 'linked-note.updated',
},
);

Expand Down Expand Up @@ -214,11 +228,25 @@ export class UpdateActivitiesCommand extends CommandRunner {

await timelineActivityRepository.update(
{
name: 'task.created',
linkedObjectMetadataId: activityObjectMetadataId,
linkedRecordId: activity.id,
},
{
linkedObjectMetadataId: taskObjectMetadataId,
name: 'linked-task.created',
},
);

await timelineActivityRepository.update(
{
name: 'task.updated',
linkedObjectMetadataId: activityObjectMetadataId,
linkedRecordId: activity.id,
},
{
linkedObjectMetadataId: taskObjectMetadataId,
name: 'linked-task.updated',
},
);
await attachmentRepository.update(
Expand Down

0 comments on commit ae7821c

Please sign in to comment.