Merge remote-tracking branch 'origin/release/16.0'

Author: iOvergaard

src/Umbraco.Web.UI.Client/package-lock.json

@@ -215,7 +215,7 @@
 		"@tiptap/extension-underline": "2.11.7",
 		"@tiptap/pm": "2.11.7",
 		"@tiptap/starter-kit": "2.11.7",
-		"@umbraco-ui/uui": "1.14.0-rc.2",
+		"@umbraco-ui/uui": "1.14.0-rc.3",
 		"@umbraco-ui/uui-css": "1.14.0-rc.2",
 		"dompurify": "^3.2.5",
 		"element-internals-polyfill": "^3.0.2",
@@ -288,4 +288,4 @@
 		"access": "public",
 		"registry": "https://registry.npmjs.org/"
 	}
-}
+}

src/Umbraco.Web.UI.Client/package.json

@@ -77,7 +77,10 @@ export class UmbBackofficeContext extends UmbContextBase {
 	}
 
 	public async serverUpgradeCheck() {
-		const version = await this.observe(this.version).asPromise();
+		const version = await this.observe(this.version)
+			.asPromise()
+			.catch(() => null);
+		if (!version) return null;
 		const repository = new UmbSysinfoRepository(this);
 		return repository.serverUpgradeCheck(version);
 	}

src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.context.ts

@@ -16,7 +16,7 @@ import type {
 	UmbBlockEditorCustomViewProperties,
 } from '@umbraco-cms/backoffice/block-custom-view';
 import type { UmbExtensionElementInitializer } from '@umbraco-cms/backoffice/extension-api';
-import { UUIBlinkAnimationValue } from '@umbraco-cms/backoffice/external/uui';
+import { UUIBlinkAnimationValue, UUIBlinkKeyframes } from '@umbraco-cms/backoffice/external/uui';
 import { UMB_PROPERTY_CONTEXT, UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
 import { UMB_CLIPBOARD_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/clipboard';
 
@@ -481,6 +481,7 @@ export class UmbBlockListEntryElement extends UmbLitElement implements UmbProper
 	}
 
 	static override styles = [
+		UUIBlinkKeyframes,
 		css`
 			:host {
 				position: relative;

src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts

@@ -548,18 +548,27 @@ export abstract class UmbBlockEntryContext<
 	abstract _gotContentType(contentType: UmbContentTypeModel | undefined): void;
 
 	async #observeVariantId() {
-		if (!this._manager) return;
+		if (!this._manager) {
+			this.removeUmbControllerByAlias('observeVariantId');
+			return;
+		}
 		await this.#contentStructurePromise;
 		if (!this.#contentStructure) {
 			throw new Error('No contentStructure found');
 		}
 
+		if (!this._manager) {
+			// The manager maybe got removed while we awaited the promise above.
+			this.removeUmbControllerByAlias('observeVariantId');
+			return;
+		}
+
 		// observe variantId:
 		this.observe(
 			observeMultiple([
 				this._manager.variantId,
-				this.#contentStructure?.ownerContentTypeObservablePart((x) => x?.variesByCulture),
-				this.#contentStructure?.ownerContentTypeObservablePart((x) => x?.variesBySegment),
+				this.#contentStructure.ownerContentTypeObservablePart((x) => x?.variesByCulture),
+				this.#contentStructure.ownerContentTypeObservablePart((x) => x?.variesBySegment),
 			]),
 			([variantId, variesByCulture, variesBySegment]) => {
 				if (!variantId || variesByCulture === undefined || variesBySegment === undefined) return;

src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entry.context.ts

@@ -182,7 +182,7 @@ export class UmbContentTypeStructureManager<
 			return { data: this.getOwnerContentType(), asObservable: () => this.ownerContentType };
 		}
 		await this.#initRepository;
-		this.#clear();
+		this.clear();
 		this.#ownerContentTypeUnique = unique;
 		if (!unique) {
 			this.#initRejection?.(`Content Type structure manager could not load: ${unique}`);
@@ -199,7 +199,7 @@ export class UmbContentTypeStructureManager<
 
 	public async createScaffold(preset?: Partial<T>): Promise<UmbRepositoryResponse<T>> {
 		await this.#initRepository;
-		this.#clear();
+		this.clear();
 
 		const repsonse = await this.#repository!.createScaffold(preset);
 		const { data } = repsonse;
@@ -827,7 +827,7 @@ export class UmbContentTypeStructureManager<
 			.filter(UmbFilterDuplicateStrings);
 	}
 
-	#clear() {
+	public clear() {
 		this.#contentTypeObservers.forEach((observer) => observer.destroy());
 		this.#contentTypeObservers = [];
 		this.#repoManager?.clear();

src/Umbraco.Web.UI.Client/src/packages/content/content-type/structure/content-type-structure-manager.class.ts

@@ -227,16 +227,16 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 					this.#currentTabComponent = undefined;
 				},
 			});
+		} else {
+			routes.push({
+				path: `**`,
+				component: async () => (await import('@umbraco-cms/backoffice/router')).UmbRouteNotFoundElement,
+				setup: () => {
+					this.#currentTabComponent = undefined;
+				},
+			});
 		}
 
-		routes.push({
-			path: `**`,
-			component: async () => (await import('@umbraco-cms/backoffice/router')).UmbRouteNotFoundElement,
-			setup: () => {
-				this.#currentTabComponent = undefined;
-			},
-		});
-
 		this._routes = routes;
 
 		// If we have a active tab, then we want to make sure its up to date with latest tab id, as an already active route is not getting its setup method triggered again [NL]

src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor.element.ts

@@ -982,6 +982,7 @@ export abstract class UmbContentDetailWorkspaceContextBase<
 
 	override resetState() {
 		super.resetState();
+		this.structure.clear();
 		this.readOnlyGuard.clearRules();
 		this.propertyViewGuard.clearRules();
 		this.propertyWriteGuard.clearRules();

src/Umbraco.Web.UI.Client/src/packages/content/content/workspace/content-detail-workspace-base.ts

@@ -72,7 +72,11 @@ export class UmbPropertyTypeWorkspaceContext
 			this.#contentTypeContext = context;
 		})
 			.skipHost()
-			.asPromise({ preventTimeout: true });
+			.asPromise({ preventTimeout: true })
+			.catch(() => {
+				// If the context is not available, we can assume that the context is not available.
+				this.#contentTypeContext = undefined;
+			});
 
 		this.routes.setRoutes([
 			{

src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/property-type-workspace.context.ts

@@ -101,12 +101,12 @@ export class UmbCollectionViewManager extends UmbControllerBase {
 						this.setCurrentView(fallbackView);
 					},
 				});
-			}
 
-			routes.push({
-				path: `**`,
-				component: async () => (await import('@umbraco-cms/backoffice/router')).UmbRouteNotFoundElement,
-			});
+				routes.push({
+					path: `**`,
+					component: async () => (await import('@umbraco-cms/backoffice/router')).UmbRouteNotFoundElement,
+				});
+			}
 		}
 
 		this.#routes.setValue(routes);