Merge branch 'release/16.0'

# Conflicts:
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts
#	version.json

Author: AndyButland

src/Umbraco.Web.UI.Client/examples/modal-routed/dashboard.element.ts

@@ -17,6 +17,7 @@ export class UmbDashboardElement extends UmbElementMixin(LitElement) {
 		},
 		{
 			path: '',
+			pathMatch: 'full',
 			redirectTo: 'tab1',
 		},
 	];

src/Umbraco.Web.UI.Client/examples/modal-routed/modal/example-modal.element.ts

@@ -17,6 +17,7 @@ export class UmbExampleModal extends UmbModalBaseElement {
 		},
 		{
 			path: '',
+			pathMatch: 'full',
 			redirectTo: 'modalOverview',
 		},
 	];

src/Umbraco.Web.UI.Client/examples/validation-context/validation-context-dashboard.ts

@@ -45,21 +45,21 @@ export class UmbExampleValidationContextDashboardElement extends UmbLitElement {
 				},
 				'observeValidationMessages',
 			);
+		});
 
-			// Observe all errors
-			this.validation.messages.messagesOfPathAndDescendant('$.form').subscribe((value) => {
-				this.totalErrorCount = [...new Set(value.map((x) => x.path))].length;
-			});
+		// Observe all errors
+		this.observe(this.validation.messages.messagesOfPathAndDescendant('$.form'), (value) => {
+			this.totalErrorCount = [...new Set(value.map((x) => x.path))].length;
+		});
 
-			// Observe errors for tab1, note that we only use part of the full JSONPath
-			this.validation.messages.messagesOfPathAndDescendant('$.form.tab1').subscribe((value) => {
-				this.tab1ErrorCount = [...new Set(value.map((x) => x.path))].length;
-			});
+		// Observe errors for tab1, note that we only use part of the full JSONPath
+		this.observe(this.validation.messages.messagesOfPathAndDescendant('$.form.tab1'), (value) => {
+			this.tab1ErrorCount = [...new Set(value.map((x) => x.path))].length;
+		});
 
-			// Observe errors for tab2, note that we only use part of the full JSONPath
-			this.validation.messages.messagesOfPathAndDescendant('$.form.tab2').subscribe((value) => {
-				this.tab2ErrorCount = [...new Set(value.map((x) => x.path))].length;
-			});
+		// Observe errors for tab2, note that we only use part of the full JSONPath
+		this.observe(this.validation.messages.messagesOfPathAndDescendant('$.form.tab2'), (value) => {
+			this.tab2ErrorCount = [...new Set(value.map((x) => x.path))].length;
 		});
 	}
 

src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-main.element.ts

@@ -63,8 +63,10 @@ export class UmbBackofficeMainElement extends UmbLitElement {
 
 		if (newRoutes.length > 0) {
 			newRoutes.push({
+				path: '',
+				pathMatch: 'full',
+				awaitStability: true,
 				redirectTo: newRoutes[0].path,
-				path: ``,
 			});
 
 			newRoutes.push({

src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consumer.test.ts

@@ -2,7 +2,7 @@ import { UmbContextProvider } from '../provide/context-provider.js';
 import { UmbContextToken } from '../token/context-token.js';
 import type { UmbContextMinimal } from '../types.js';
 import { UmbContextConsumer } from './context-consumer.js';
-import type { UmbContextRequestEventImplementation } from './context-request.event.js';
+import { UmbContextRequestEventImplementation } from './context-request.event.js';
 import { UMB_CONTEXT_REQUEST_EVENT_TYPE } from './context-request.event.js';
 import { assert, expect, oneEvent } from '@open-wc/testing';
 
@@ -266,7 +266,7 @@ describe('UmbContextConsumer', () => {
 			localConsumer.hostConnected();
 		});
 
-		it('does not respond to a non existing api alias', (done) => {
+		it('does not respond to a non existing api alias', async () => {
 			const provider = new UmbContextProvider(
 				document.body,
 				testContextAliasAndApiAlias,
@@ -277,21 +277,19 @@ describe('UmbContextConsumer', () => {
 			let callbackCount = 0;
 
 			const localConsumer = new UmbContextConsumer(element, testContextAliasAndNotExistingApiAlias, (context) => {
-				callbackCount++;
-				if (callbackCount === 1) {
-					expect(context).to.be.undefined;
-					done();
-				} else {
-					assert.fail('Callback should not be called more than once');
-				}
+				assert.fail('Callback should not be called more than once');
 			});
+			const requestEvent = oneEvent(localConsumer.getHostElement(), UMB_CONTEXT_REQUEST_EVENT_TYPE);
 			localConsumer.hostConnected();
 
+			await requestEvent;
+			await Promise.resolve();
+
 			// Delayed check to make sure the callback is not called.
-			Promise.resolve().then(() => {
-				localConsumer.hostDisconnected();
-				provider.hostDisconnected();
-			});
+
+			expect(callbackCount).to.equal(0, 'Callback should never have been called');
+			localConsumer.hostDisconnected();
+			provider.hostDisconnected();
 		});
 	});
 
@@ -368,7 +366,7 @@ describe('UmbContextConsumer', () => {
 			localConsumer.hostConnected();
 		});
 
-		it('disapproving discriminator does not fire callback', (done) => {
+		it('disapproving discriminator does not fire callback', async () => {
 			const provider = new UmbContextProvider(document.body, testContextAlias, new UmbTestContextConsumerClass());
 			provider.hostConnected();
 
@@ -379,24 +377,21 @@ describe('UmbContextConsumer', () => {
 				new UmbContextToken(testContextAlias, undefined, badDiscriminator),
 				(_instance) => {
 					callbackCount++;
-					if (callbackCount === 1) {
-						expect(_instance).to.be.undefined;
-						done();
-					} else {
-						assert.fail('Callback should not be called more than once');
-					}
+					assert.fail('Callback should not be called more than once');
 				},
 			);
+			const requestEvent = oneEvent(localConsumer.getHostElement(), UMB_CONTEXT_REQUEST_EVENT_TYPE);
 			localConsumer.hostConnected();
 
 			// Wait for to ensure the above request didn't succeed:
-			Promise.resolve().then(() => {
-				localConsumer.hostDisconnected();
-				provider.hostDisconnected();
-			});
+			await requestEvent;
+			await Promise.resolve();
+			expect(callbackCount).to.equal(0, 'Callback should never have been called');
+			localConsumer.hostDisconnected();
+			provider.hostDisconnected();
 		});
 
-		it('context api of same context alias will prevent request from propagating', (done) => {
+		it('context api of same context alias will prevent request from propagating', async () => {
 			const provider = new UmbContextProvider(document.body, testContextAlias, new UmbTestContextConsumerClass());
 			provider.hostConnected();
 
@@ -414,19 +409,18 @@ describe('UmbContextConsumer', () => {
 				new UmbContextToken(testContextAlias, undefined, discriminator),
 				(_instance) => {
 					callbackCount++;
-					if (callbackCount === 1) {
-						expect(_instance).to.be.undefined;
-						done();
-					}
 				},
 			);
+			const requestEvent = oneEvent(localConsumer.getHostElement(), UMB_CONTEXT_REQUEST_EVENT_TYPE);
 			localConsumer.hostConnected();
 
+			await requestEvent;
+			await Promise.resolve();
 			// Wait for to ensure the above request didn't succeed:
-			Promise.resolve().then(() => {
-				localConsumer.hostDisconnected();
-				provider.hostDisconnected();
-			});
+
+			expect(callbackCount).to.equal(0, 'Callback should never have been called');
+			localConsumer.hostDisconnected();
+			provider.hostDisconnected();
 		});
 
 		it('context api of same context alias will NOT prevent request from propagating when set to passContextAliasMatches', (done) => {

src/Umbraco.Web.UI.Client/src/libs/context-api/consume/context-consumer.ts

@@ -219,8 +219,7 @@ export class UmbContextConsumer<
 			this.#raf = undefined;
 		}
 
-		this.#instance = undefined;
-		this.#callback?.(undefined);
+		this.#unprovide();
 		if (this.#promiseRejecter) {
 			const hostElement = this._retrieveHost();
 			this.#promiseRejecter(

src/Umbraco.Web.UI.Client/src/libs/controller-api/controller-host.mixin.ts

@@ -60,8 +60,8 @@ export const UmbControllerHostMixin = <T extends ClassConstructor>(superClass: T
 			if (this.#attached) {
 				// If a controller is created on a already attached element, then it will be added directly. This might not be optimal. As the controller it self has not finished its constructor method jet. therefor i postpone the call: [NL]
 				Promise.resolve().then(() => {
-					// Extra check to see if we are still attached at this point:
-					if (this.#attached) {
+					// Extra check to see if we are still attached and still added at this point:
+					if (this.#attached && this.#controllers.includes(ctrl)) {
 						ctrl.hostConnected();
 					}
 				});

src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts

@@ -123,6 +123,7 @@ export class UmbBlockWorkspaceViewEditElement extends UmbLitElement implements U
 			if (!this._hasRootGroups) {
 				routes.push({
 					path: '',
+					pathMatch: 'full',
 					redirectTo: routes[0]?.path,
 				});
 			}

src/Umbraco.Web.UI.Client/src/packages/code-editor/property-editor/property-editor-ui-code-editor.element.ts

@@ -38,13 +38,20 @@ export class UmbPropertyEditorUICodeEditorElement extends UmbLitElement implemen
 	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		if (!config) return;
 
-		this._language = config?.getValueByAlias<CodeEditorLanguage>('language') ?? this.#defaultLanguage;
+		this._language = this.#getConfiguredLanguage(config);
 		this._height = Number(config?.getValueByAlias('height')) || 400;
 		this._lineNumbers = config?.getValueByAlias('lineNumbers') ?? false;
 		this._minimap = config?.getValueByAlias('minimap') ?? false;
 		this._wordWrap = config?.getValueByAlias('wordWrap') ?? false;
 	}
 
+	#getConfiguredLanguage(config: UmbPropertyEditorConfigCollection) {
+		const configuredLanguage = config?.getValueByAlias<CodeEditorLanguage>('language') ?? this.#defaultLanguage;
+		return Array.isArray(configuredLanguage)
+			? (configuredLanguage.length > 0 ? configuredLanguage[0] : this.#defaultLanguage)
+			: configuredLanguage;
+	}
+
 	#onChange(event: UmbInputEvent & { target: UmbCodeEditorElement }) {
 		if (!(event instanceof UmbInputEvent)) return;
 		this.value = event.target.code;

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

@@ -26,6 +26,7 @@ export class UmbContentTypePropertyStructureHelper<T extends UmbContentTypeModel
 	// State which holds all the properties of the current container, this is a composition of all properties from the containers that matches our target [NL]
 	#propertyStructure = new UmbArrayState<UmbPropertyTypeModel>([], (x) => x.unique);
 	readonly propertyStructure = this.#propertyStructure.asObservable();
+	readonly propertyAliases = this.#propertyStructure.asObservablePart((x) => x.map((e) => e.alias));
 
 	constructor(host: UmbControllerHost) {
 		super(host);