Merge branch 'v15/dev' into v15/feature/reworking-error-notifications

Author: nielslyngsoe

src/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidator.cs

@@ -32,16 +32,14 @@ private bool ValidateSmtpSetting(SmtpSettings? value, out string message) =>
 
     private bool ValidateSqlWriteLockTimeOutSetting(TimeSpan configuredTimeOut, out string message)
     {
-        // Only apply this setting if it's not excessively high or low
+        // Only apply this setting if it's not excessively low
         const int minimumTimeOut = 100;
-        const int maximumTimeOut = 20000;
 
         // between 0.1 and 20 seconds
-        if (configuredTimeOut.TotalMilliseconds < minimumTimeOut ||
-            configuredTimeOut.TotalMilliseconds > maximumTimeOut)
+        if (configuredTimeOut.TotalMilliseconds < minimumTimeOut)
         {
             message =
-                $"The `{Constants.Configuration.ConfigGlobal}:{nameof(GlobalSettings.DistributedLockingWriteLockDefaultTimeout)}` setting is not between the minimum of {minimumTimeOut} ms and maximum of {maximumTimeOut} ms";
+                $"The `{Constants.Configuration.ConfigGlobal}:{nameof(GlobalSettings.DistributedLockingWriteLockDefaultTimeout)}` should not be configured as less than {minimumTimeOut} ms";
             return false;
         }
 

src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.context.ts

@@ -78,23 +78,6 @@ export class UmbDefaultTreeContext<
 		// listen for page changes on the pagination manager
 		this.pagination.addEventListener(UmbChangeEvent.TYPE, this.#onPageChange);
 
-		/* TODO: revisit. This is a temp solution to notify the parent it needs to reload its children
-		there might be a better way to do this through a tree item parent context.
-		It does not look like there is a way to have a "dynamic" parent context that will stop when a
-		specific parent is reached (a tree item unique that matches the parentUnique of this item) */
-		const hostElement = this.getHostElement();
-		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-		// @ts-ignore
-		hostElement.addEventListener('temp-reload-tree-item-parent', (event: CustomEvent) => {
-			const treeRoot = this.#treeRoot.getValue();
-			const unique = treeRoot?.unique;
-
-			if (event.detail.unique === unique) {
-				event.stopPropagation();
-				this.loadTree();
-			}
-		});
-
 		// always load the tree root because we need the root entity to reload the entire tree
 		this.#loadTreeRoot();
 	}

src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts

@@ -68,7 +68,9 @@ export abstract class UmbTreeItemContextBase<
 	#foldersOnly = new UmbBooleanState(false);
 	readonly foldersOnly = this.#foldersOnly.asObservable();
 
-	treeContext?: UmbDefaultTreeContext<TreeItemType, TreeRootType>;
+	public treeContext?: UmbDefaultTreeContext<TreeItemType, TreeRootType>;
+	public parentTreeItemContext?: UmbTreeItemContext<TreeItemType>;
+
 	#sectionContext?: typeof UMB_SECTION_CONTEXT.TYPE;
 	#sectionSidebarContext?: typeof UMB_SECTION_SIDEBAR_CONTEXT.TYPE;
 	#actionEventContext?: typeof UMB_ACTION_EVENT_CONTEXT.TYPE;
@@ -87,24 +89,6 @@ export abstract class UmbTreeItemContextBase<
 		// listen for page changes on the pagination manager
 		this.pagination.addEventListener(UmbChangeEvent.TYPE, this.#onPageChange);
 
-		/* TODO: revisit. This is a temp solution to notify the parent it needs to reload its children
-		there might be a better way to do this through a tree item parent context.
-		It does not look like there is a way to have a "dynamic" parent context that will stop when a
-		specific parent is reached (a tree item unique that matches the parentUnique of this item) */
-		const hostElement = this.getHostElement();
-		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-		// @ts-ignore
-		hostElement.addEventListener('temp-reload-tree-item-parent', (event: CustomEvent) => {
-			const treeItem = this.getTreeItem();
-			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-			// @ts-ignore
-			const unique = treeItem?.unique;
-			if (event.detail.unique === unique) {
-				event.stopPropagation();
-				this.loadChildren();
-			}
-		});
-
 		window.addEventListener('navigationend', this.#debouncedCheckIsActive);
 	}
 
@@ -248,6 +232,10 @@ export abstract class UmbTreeItemContextBase<
 			this.#observeFoldersOnly();
 		});
 
+		this.consumeContext(UMB_TREE_ITEM_CONTEXT, (instance) => {
+			this.parentTreeItemContext = instance;
+		}).skipHost();
+
 		this.consumeContext(UMB_ACTION_EVENT_CONTEXT, (instance) => {
 			this.#removeEventListeners();
 			this.#actionEventContext = instance;
@@ -353,19 +341,11 @@ export abstract class UmbTreeItemContextBase<
 		if (event.getUnique() !== this.unique) return;
 		if (event.getEntityType() !== this.entityType) return;
 
-		/* TODO: revisit. This is a temp solution to notify the parent it needs to reload its children
-		there might be a better way to do this through a tree item parent context.
-		It does not look like there is a way to have a "dynamic" parent context that will stop when a
-		specific parent is reached (a tree item unique that matches the parentUnique of this item) */
-		const treeItem = this.getTreeItem();
-		const parentUnique = treeItem?.parent.unique;
-
-		const customEvent = new CustomEvent('temp-reload-tree-item-parent', {
-			detail: { unique: parentUnique },
-			bubbles: true,
-			composed: true,
-		});
-		this.getHostElement().dispatchEvent(customEvent);
+		if (this.parentTreeItemContext) {
+			this.parentTreeItemContext.loadChildren();
+		} else {
+			this.treeContext?.loadTree();
+		}
 	};
 
 	#onPageChange = (event: UmbChangeEvent) => {

src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-context.interface.ts

@@ -17,6 +17,7 @@ export interface UmbTreeItemContext<TreeItemType extends UmbTreeItemModel> exten
 	hasActions: Observable<boolean>;
 	path: Observable<string>;
 	pagination: UmbPaginationManager;
+	getTreeItem(): TreeItemType | undefined;
 	setTreeItem(treeItem: TreeItemType | undefined): void;
 	loadChildren(): void;
 	toggleContextMenu(): void;

tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs

@@ -39,16 +39,6 @@ public void Returns_Fail_For_Configuration_With_Insufficient_SqlWriteLockTimeOut
         Assert.False(result.Succeeded);
     }
 
-    [Test]
-    public void Returns_Fail_For_Configuration_With_Excessive_SqlWriteLockTimeOut()
-    {
-        var validator = new GlobalSettingsValidator();
-        var options = new GlobalSettings { DistributedLockingWriteLockDefaultTimeout = TimeSpan.Parse("00:00:21") };
-
-        var result = validator.Validate("settings", options);
-        Assert.False(result.Succeeded);
-    }
-
     [Test]
     public void Returns_Success_For_Configuration_With_Valid_SqlWriteLockTimeOut()
     {