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

Migrate messageFolder parentFolderId from UUID to externalId (#19348)

Browse Source 
This PR migrates `messageFolder`.`parentFolderId` from an internal
`UUID` reference to external provider id.
Eliminates unnecessary lookup and complexity

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
neo773
2026-04-06 14:42:44 +05:30
committed by GitHub
parent 0d44d7c6d7
commit 8d61bb9ae6
6 changed files with 117 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-front/src/modules/settings/accounts/components/message-folders/utils/__tests__/computeMessageFolderTree.test.ts
+2 -2
View File
@@ -147,7 +147,7 @@ describe('computeMessageFolderTree', () => {
expect(result[0].children[1].folder.name).toBe('Projects');
});
it('should resolve parent-child when parentFolderId references parent id instead of externalId', () => {
it('should resolve parent-child when parentFolderId references parent externalId', () => {
const parent = createFolder(
'20202020-aaaa-bbbb-cccc-000000000001',
'custom folder',
@@ -157,7 +157,7 @@ describe('computeMessageFolderTree', () => {
const child = createFolder(
'20202020-aaaa-bbbb-cccc-000000000002',
'child folder',
'20202020-aaaa-bbbb-cccc-000000000001',
'Label_5900090362003645629',
'Label_7713410187110265162',
);
const result = computeMessageFolderTree([parent, child]);
packages/twenty-front/src/modules/settings/accounts/components/message-folders/utils/computeFolderIdsForSyncToggle.ts
+3 -9
View File
@@ -18,9 +18,7 @@ export const computeFolderIdsForSyncToggle = ({
const folder = folderById.get(id);
const children = folder
? allFolders.filter(
(childFolder) =>
childFolder.parentFolderId === folder.externalId ||
childFolder.parentFolderId === folder.id,
(childFolder) => childFolder.parentFolderId === folder.externalId,
)
: [];
@@ -40,9 +38,7 @@ export const computeFolderIdsForSyncToggle = ({
break;
}
const parent =
folderByExternalId.get(current.parentFolderId) ??
folderById.get(current.parentFolderId);
const parent = folderByExternalId.get(current.parentFolderId);
if (!parent) {
break;
@@ -67,9 +63,7 @@ export const computeFolderIdsForSyncToggle = ({
for (const parent of collectParents(folderId)) {
const children = allFolders.filter(
(folder) =>
folder.parentFolderId === parent.externalId ||
folder.parentFolderId === parent.id,
(folder) => folder.parentFolderId === parent.externalId,
);
const hasOtherSyncedChild = children.some(
(child) => child.isSynced && !idsToUnsync.has(child.id),
packages/twenty-front/src/modules/settings/accounts/components/message-folders/utils/computeMessageFolderTree.ts
+2 -9
View File
@@ -11,21 +11,17 @@ export const computeMessageFolderTree = (
folders: MessageFolder[],
): MessageFolderTreeNode[] => {
const folderByExternalIdMap = new Map<string, MessageFolder>();
const folderByIdMap = new Map<string, MessageFolder>();
const childrenMap = new Map<string, MessageFolder[]>();
folders.forEach((folder) => {
if (isDefined(folder.externalId)) {
folderByExternalIdMap.set(folder.externalId, folder);
}
folderByIdMap.set(folder.id, folder);
});
folders.forEach((folder) => {
if (isDefined(folder.parentFolderId)) {
const parent =
folderByExternalIdMap.get(folder.parentFolderId) ??
folderByIdMap.get(folder.parentFolderId);
const parent = folderByExternalIdMap.get(folder.parentFolderId);
if (isDefined(parent)) {
const siblings = childrenMap.get(parent.id) || [];
@@ -51,10 +47,7 @@ export const computeMessageFolderTree = (
const rootFolders = folders.filter((folder) => {
if (!folder.parentFolderId) return true;
return (
!folderByExternalIdMap.has(folder.parentFolderId) &&
!folderByIdMap.has(folder.parentFolderId)
);
return !folderByExternalIdMap.has(folder.parentFolderId);
});
rootFolders.sort((a, b) => a.name.localeCompare(b.name));