From 1a9d8e3a5daf2b5448364e215af8c18a4e9c0ed5 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Wed, 9 Apr 2025 10:15:00 +0200
Subject: [PATCH] Fixes label of enable/prevent clean up button after update
 (#18946)

* Update enable cleanup button text on toggle.

* Handle console error visible on cancel of rollback dialog.

* Return value from `umb-rollback-modal`

---------

Co-authored-by: leekelleher <leekelleher@gmail.com>
---
 .../documents/rollback/entity-action/rollback.action.ts       | 4 +++-
 .../documents/rollback/modal/rollback-modal.element.ts        | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/entity-action/rollback.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/entity-action/rollback.action.ts
index 163f3d74bd..f35ce5a9ad 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/entity-action/rollback.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/entity-action/rollback.action.ts
@@ -11,7 +11,9 @@ export class UmbRollbackDocumentEntityAction extends UmbEntityActionBase<never>
 		const modalManagerContext = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
 		const modalContext = modalManagerContext.open(this, UMB_ROLLBACK_MODAL, {});
 
-		await modalContext.onSubmit();
+		const data = await modalContext.onSubmit().catch(() => undefined);
+		if (!data) return;
+
 		const notificationContext = await this.getContext(UMB_NOTIFICATION_CONTEXT);
 		notificationContext.peek('positive', {
 			data: { message: this.#localize.term('rollback_documentRolledBack') },
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/modal/rollback-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/modal/rollback-modal.element.ts
index e41ad2d053..a5775e4532 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/modal/rollback-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/modal/rollback-modal.element.ts
@@ -223,6 +223,8 @@ export class UmbRollbackModalElement extends UmbModalBaseElement<UmbRollbackModa
 		const entityUpdatedEvent = new UmbEntityUpdatedEvent({ unique, entityType });
 		actionEventContext.dispatchEvent(entityUpdatedEvent);
 
+		this.value = {};
+
 		this.modalContext?.submit();
 	}
 
@@ -243,7 +245,7 @@ export class UmbRollbackModalElement extends UmbModalBaseElement<UmbRollbackModa
 		if (!version) return;
 
 		version.preventCleanup = preventCleanup;
-		this.requestUpdate('versions');
+		this.requestUpdate('_versions');
 	}
 
 	#onChangeCulture(event: UUISelectEvent) {