Merge branch 'release/16.0'

Author: iOvergaard

src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs

@@ -14,8 +14,8 @@ public static class ContentSettingsExtensions
     ///   <c>true</c> if the file extension is allowed for upload; otherwise, <c>false</c>.
     /// </returns>
     public static bool IsFileAllowedForUpload(this ContentSettings contentSettings, string extension)
-        => contentSettings.AllowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension)) ||
-        (contentSettings.AllowedUploadedFileExtensions.Any() == false && contentSettings.DisallowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension)) == false);
+        => contentSettings.AllowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension.Trim())) ||
+        (contentSettings.AllowedUploadedFileExtensions.Any() == false && contentSettings.DisallowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension.Trim())) == false);
 
     /// <summary>
     /// Gets the auto-fill configuration for a specified property alias.

src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts

@@ -16,7 +16,7 @@ export default {
 			'In order to improve Umbraco and add new functionality based on as relevant information as possible, we would like to collect system- and usage information from your installation.<br>Aggregate data will be shared on a regular basis as well as learnings from these metrics.<br>Hopefully, you will help us collect some valuable data.<br><br>We <strong>WILL NOT</strong> collect any personal data such as content, code, user information, and all data will be fully anonymized.',
 		basicLevelDescription: 'We will send an anonymized site ID, Umbraco version, and packages installed',
 		detailedLevelDescription:
-			'We will send: <ul>li>Anonymized site ID, Umbraco version, and packages installed.</li><li>Number of: Root nodes, Content nodes, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, and Property Editors in use.</li><li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li><li>Configuration settings: ModelsBuilder mode, if custom Umbraco path exists, ASP environment, whether the delivery API is enabled, and allows public access, and if you are in debug mode.</li></ul><em>We might change what we send on the Detailed level in the future. If so, it will be listed above.<br>By choosing "Detailed" you agree to current and future anonymized information being collected.</em>',
+			'We will send: <ul><li>Anonymized site ID, Umbraco version, and packages installed.</li><li>Number of: Root nodes, Content nodes, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, and Property Editors in use.</li><li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li><li>Configuration settings: ModelsBuilder mode, if custom Umbraco path exists, ASP environment, whether the delivery API is enabled, and allows public access, and if you are in debug mode.</li></ul><em>We might change what we send on the Detailed level in the future. If so, it will be listed above.<br>By choosing "Detailed" you agree to current and future anonymized information being collected.</em>',
 		minimalLevelDescription: 'We will only send an anonymized site ID to let us know that the site exists.',
 	},
 	blockEditor: {

src/Umbraco.Web.UI.Client/src/external/rxjs/index.ts

@@ -1,22 +1,24 @@
 export {
+	BehaviorSubject,
+	Observable,
 	ReplaySubject,
 	Subject,
-	Observable,
-	BehaviorSubject,
 	Subscription,
-	map,
-	distinctUntilChanged,
+	catchError,
 	combineLatest,
-	shareReplay,
-	takeUntil,
 	debounceTime,
-	tap,
-	of,
-	lastValueFrom,
-	firstValueFrom,
-	switchMap,
+	distinctUntilChanged,
 	filter,
-	startWith,
-	skip,
 	first,
+	firstValueFrom,
+	from,
+	lastValueFrom,
+	map,
+	of,
+	shareReplay,
+	skip,
+	startWith,
+	switchMap,
+	takeUntil,
+	tap,
 } from 'rxjs';

src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/server-extension-registrator.controller.ts

@@ -34,7 +34,9 @@ export class UmbServerExtensionRegistrator extends UmbControllerBase {
 	 * @remark Users must have the BACKOFFICE_ACCESS permission to access this method.
 	 */
 	public async registerPrivateExtensions() {
-		const { data: packages } = await tryExecute(this, ManifestService.getManifestManifestPrivate());
+		const { data: packages } = await tryExecute(this, ManifestService.getManifestManifestPrivate(), {
+			disableNotifications: true,
+		});
 		if (packages) {
 			await this.#loadServerPackages(packages);
 		}
@@ -46,7 +48,9 @@ export class UmbServerExtensionRegistrator extends UmbControllerBase {
 	 * @remark Any user can access this method without any permissions.
 	 */
 	public async registerPublicExtensions() {
-		const { data: packages } = await tryExecute(this, ManifestService.getManifestManifestPublic());
+		const { data: packages } = await tryExecute(this, ManifestService.getManifestManifestPublic(), {
+			disableNotifications: true,
+		});
 		if (packages) {
 			await this.#loadServerPackages(packages);
 		}

src/Umbraco.Web.UI.Client/src/packages/content/content/components/property-type-based-property/property-type-based-property.context-token.ts

@@ -10,5 +10,5 @@ export const UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT = new UmbContextToken<UmbP
  * This will be removed in v.18
  */
 export const UMB_CONTENT_PROPERTY_CONTEXT = new UmbContextToken<UmbPropertyTypeBasedPropertyContext>(
-	'UmbContentPropertyContext',
+	'UmbPropertyTypeBasedPropertyContext',
 );

src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-filter-field.element.ts

@@ -34,7 +34,7 @@ export class UmbCollectionFilterFieldElement extends UmbLitElement {
 	static override readonly styles = [
 		css`
 			uui-input {
-				display: block;
+				width: 100%;
 			}
 		`,
 	];

src/Umbraco.Web.UI.Client/src/packages/core/localization/localize.element.test.ts

@@ -3,11 +3,13 @@ import { aTimeout, elementUpdated, expect, fixture, html } from '@open-wc/testin
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
 import { umbLocalizationRegistry } from './registry/localization.registry.js';
+import type { ManifestLocalization } from './extensions/localization.extension.js';
 
-const english = {
+const english: ManifestLocalization = {
 	type: 'localization',
 	alias: 'test.en',
 	name: 'Test English',
+	weight: 100,
 	meta: {
 		culture: 'en',
 		localizations: {
@@ -27,7 +29,75 @@ const english = {
 	},
 };
 
-const danish = {
+const englishUs: ManifestLocalization = {
+	type: 'localization',
+	alias: 'test.en-us',
+	name: 'Test English (US)',
+	weight: 100,
+	meta: {
+		culture: 'en-us',
+		localizations: {
+			general: {
+				close: 'Close US',
+				overridden: 'Overridden',
+			},
+		},
+	},
+};
+
+// This is a factory function that returns the localization object.
+const asyncFactory = async (localizations: Record<string, any>, delay: number) => {
+	await aTimeout(delay); // Simulate async loading
+	return {
+		// Simulate a JS module that exports a localization object.
+		default: localizations,
+	};
+};
+
+// This is an async localization that overrides the previous one.
+const englishAsyncOverride: ManifestLocalization = {
+	type: 'localization',
+	alias: 'test.en.async-override',
+	name: 'Test English Async Override',
+	weight: -100,
+	meta: {
+		culture: 'en-us',
+	},
+	js: () =>
+		asyncFactory(
+			{
+				general: {
+					close: 'Close Async',
+					overridden: 'Overridden Async',
+				},
+			},
+			100,
+		),
+};
+
+// This is another async localization that loads later than the previous one and overrides it because of a lower weight.
+const english2AsyncOverride: ManifestLocalization = {
+	type: 'localization',
+	alias: 'test.en.async-override-2',
+	name: 'Test English Async Override 2',
+	weight: -200,
+	meta: {
+		culture: 'en-us',
+	},
+	js: () =>
+		asyncFactory(
+			{
+				general: {
+					close: 'Another Async Close',
+				},
+			},
+			200, // This will load after the first async override
+			// so it should override the close translation.
+			// The overridden translation should not be overridden.
+		),
+};
+
+const danish: ManifestLocalization = {
 	type: 'localization',
 	alias: 'test.da',
 	name: 'Test Danish',
@@ -53,8 +123,7 @@ describe('umb-localize', () => {
 	});
 
 	describe('localization', () => {
-		umbExtensionsRegistry.register(english);
-		umbExtensionsRegistry.register(danish);
+		umbExtensionsRegistry.registerMany([english, englishUs, danish]);
 
 		beforeEach(async () => {
 			umbLocalizationRegistry.loadLanguage(english.meta.culture);
@@ -123,13 +192,50 @@ describe('umb-localize', () => {
 		it('should change the value if the language is changed', async () => {
 			expect(element.shadowRoot?.innerHTML).to.contain('Close');
 
+			// Change to Danish
 			umbLocalizationRegistry.loadLanguage(danish.meta.culture);
 			await aTimeout(0);
 			await elementUpdated(element);
-
 			expect(element.shadowRoot?.innerHTML).to.contain('Luk');
 		});
 
+		it('should fall back to the fallback language if the key is not found', async () => {
+			expect(element.shadowRoot?.innerHTML).to.contain('Close');
+
+			// Change to US English
+			umbLocalizationRegistry.loadLanguage(englishUs.meta.culture);
+			await aTimeout(0);
+			await elementUpdated(element);
+			expect(element.shadowRoot?.innerHTML).to.contain('Close US');
+
+			element.key = 'general_overridden';
+			await elementUpdated(element);
+			expect(element.shadowRoot?.innerHTML).to.contain('Overridden');
+
+			element.key = 'general_logout';
+			await elementUpdated(element);
+			expect(element.shadowRoot?.innerHTML).to.contain('Log out');
+		});
+
+		it('should accept a lazy loaded localization', async () => {
+			umbExtensionsRegistry.registerMany([englishAsyncOverride, english2AsyncOverride]);
+			umbLocalizationRegistry.loadLanguage(englishAsyncOverride.meta.culture);
+			await aTimeout(200); // Wait for the async override to load
+
+			await elementUpdated(element);
+			expect(element.shadowRoot?.innerHTML).to.contain(
+				'Another Async Close',
+				'(async) Should have overridden the close (from first language)',
+			);
+
+			element.key = 'general_overridden';
+			await elementUpdated(element);
+			expect(element.shadowRoot?.innerHTML).to.contain(
+				'Overridden Async',
+				'(async) Should not have overridden the overridden (from first language)',
+			);
+		});
+
 		it('should use the slot if translation is not found', async () => {
 			element.key = 'non-existing-key';
 			await elementUpdated(element);