diff --git a/src/app/features/menu-tree/menu-tree.service.ts b/src/app/features/menu-tree/menu-tree.service.ts index cc073bf9c..8d6ad0331 100644 --- a/src/app/features/menu-tree/menu-tree.service.ts +++ b/src/app/features/menu-tree/menu-tree.service.ts @@ -199,20 +199,20 @@ export class MenuTreeService { } if (itemType === 'project' && node.kind === 'project') { - const project = itemMap.get(node.projectId); + const project = itemMap.get(node.id); if (!project) { return null; } - usedIds.add(node.projectId); + usedIds.add(node.id); return createViewNode(project) as MenuTreeViewProjectNode; } if (itemType === 'tag' && node.kind === 'tag') { - const tag = itemMap.get(node.tagId); + const tag = itemMap.get(node.id); if (!tag) { return null; } - usedIds.add(node.tagId); + usedIds.add(node.id); return createViewNode(tag) as MenuTreeViewTagNode; } @@ -256,7 +256,6 @@ export class MenuTreeService { return { kind: 'project', id: node.project.id, - projectId: node.project.id, } satisfies MenuTreeProjectNode; } @@ -264,7 +263,6 @@ export class MenuTreeService { return { kind: 'tag', id: node.tag.id, - tagId: node.tag.id, } satisfies MenuTreeTagNode; } diff --git a/src/app/features/menu-tree/store/menu-tree.model.ts b/src/app/features/menu-tree/store/menu-tree.model.ts index be3fba20e..c454f0f84 100644 --- a/src/app/features/menu-tree/store/menu-tree.model.ts +++ b/src/app/features/menu-tree/store/menu-tree.model.ts @@ -15,12 +15,10 @@ interface MenuTreeBaseNode { export interface MenuTreeProjectNode extends MenuTreeBaseNode { kind: 'project'; - projectId: string; } export interface MenuTreeTagNode extends MenuTreeBaseNode { kind: 'tag'; - tagId: string; } export interface MenuTreeFolderNode extends MenuTreeBaseNode {