yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: Workspace breadcrumbs, error when new at root

Browse Source
This commit is contained in:
leekelleher
2024-06-06 15:02:51 +01:00
parent 09da5c1117
commit 401c084ca5
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-tree-structure-workspace-context-base.ts
View File

@@ -58,28 +58,31 @@ export abstract class UmbMenuTreeStructureWorkspaceContextBase extends UmbContex
}
const isNew = this.#workspaceContext?.getIsNew();
const uniqueObservable = isNew ? this.#workspaceContext?.parentUnique : this.#workspaceContext?.unique;
const entityTypeObservable = isNew ? this.#workspaceContext?.parentEntityType : this.#workspaceContext?.entityType;
const unique = (await this.observe(uniqueObservable, () => {})?.asPromise()) as string;
if (!unique) throw new Error('Unique is not available');
const entityType = (await this.observe(entityTypeObservable, () => {})?.asPromise()) as string;
if (!entityType) throw new Error('Entity type is not available');
const { data } = await treeRepository.requestTreeItemAncestors({ treeItem: { unique, entityType } });
// If the entity type is different from the root entity type, then we can request the ancestors.
if (entityType !== root?.entityType) {
const uniqueObservable = isNew ? this.#workspaceContext?.parentUnique : this.#workspaceContext?.unique;
const unique = (await this.observe(uniqueObservable, () => {})?.asPromise()) as string;
if (!unique) throw new Error('Unique is not available');
if (data) {
const ancestorItems = data.map((treeItem) => {
return {
unique: treeItem.unique,
entityType: treeItem.entityType,
name: treeItem.name,
isFolder: treeItem.isFolder,
};
});
const { data } = await treeRepository.requestTreeItemAncestors({ treeItem: { unique, entityType } });
structureItems.push(...ancestorItems);
if (data) {
const ancestorItems = data.map((treeItem) => {
return {
unique: treeItem.unique,
entityType: treeItem.entityType,
name: treeItem.name,
isFolder: treeItem.isFolder,
};
});
structureItems.push(...ancestorItems);
}
}
const parent = structureItems[structureItems.length - 2];