Merge remote-tracking branch 'origin/main' into feature/document-type-picker-and-tabs

src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-property-structure-manager.class.ts

@@ -32,8 +32,8 @@ export class UmbWorkspacePropertyStructureManager<R extends UmbDocumentTypeRepos
 	 * This will give us all the structure for properties and containers.
 	 */
 	public async loadType(key?: string) {
-		// TODO: I guess it would make sense to clean up, in this case we most likely don't need any of the old document types:
-		//this.#documentTypes.next([]);
+		this.#documentTypes.next([]);
+		this.#containers.next([]);
 		await this._loadType(key);
 	}
 

src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.element.ts

@@ -3,6 +3,7 @@ import { css, html } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 
 import '../workspace-layout/workspace-layout.element';
+import '../../../../shared/components/variant-selector/variant-selector.element.ts';
 
 // Lazy load
 // TODO: Make this dynamic, use load-extensions method to loop over extensions for this node.