Merge branch 'release/16.0'

Author: AndyButland

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

@@ -54,10 +54,10 @@ export abstract class UmbMenuVariantTreeStructureWorkspaceContextBase extends Um
 	async #requestStructure() {
 		const isNew = this.#workspaceContext?.getIsNew();
 		const uniqueObservable = isNew
-			? this.#workspaceContext?._internal_createUnderParentEntityType
+			? this.#workspaceContext?._internal_createUnderParentEntityUnique
 			: this.#workspaceContext?.unique;
 		const entityTypeObservable = isNew
-			? this.#workspaceContext?._internal_createUnderParentEntityUnique
+			? this.#workspaceContext?._internal_createUnderParentEntityType
 			: this.#workspaceContext?.entityType;
 
 		let structureItems: Array<UmbVariantStructureItemModel> = [];
@@ -112,7 +112,7 @@ export abstract class UmbMenuVariantTreeStructureWorkspaceContextBase extends Um
 	}
 
 	#setParentData(structureItems: Array<UmbVariantStructureItemModel>) {
-		/* If the item is not new, the current item is the last item in the array. 
+		/* If the item is not new, the current item is the last item in the array.
 			We filter out the current item unique to handle any case where it could show up */
 		const parent = structureItems.filter((item) => item.unique !== this.#workspaceContext?.getUnique()).pop();
 
@@ -142,7 +142,7 @@ export abstract class UmbMenuVariantTreeStructureWorkspaceContextBase extends Um
 
 				return entity;
 			})
-			/* If the item is not new, the current item is the last item in the array. 
+			/* If the item is not new, the current item is the last item in the array.
 			We filter out the current item unique to handle any case where it could show up */
 			.filter((item) => item.unique !== this.#workspaceContext?.getUnique());
 

src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.element.ts

@@ -58,10 +58,12 @@ export class UmbWorkspaceVariantMenuBreadcrumbElement extends UmbLitElement {
 
 	#observeStructure() {
 		if (!this.#structureContext || !this.#workspaceContext) return;
-		const isNew = this.#workspaceContext.getIsNew();
 
 		this.observe(this.#structureContext.structure, (value) => {
-			this._structure = isNew ? value : value.slice(0, -1);
+			if (!this.#workspaceContext) return;
+			const unique = this.#workspaceContext.getUnique();
+			// exclude the current unique from the structure. We append this with an observer of the name
+			this._structure = value.filter((structureItem) => structureItem.unique !== unique);
 		});
 	}