From 9a436f3d8dc071c93da95dd5644da3e302a0e23c Mon Sep 17 00:00:00 2001
From: JesmoDev <26099018+JesmoDev@users.noreply.github.com>
Date: Wed, 10 Apr 2024 13:44:42 +0200
Subject: [PATCH] small fixes

---
 .../src/assets/lang/da-dk.ts                  |  1 +
 .../src/assets/lang/en-us.ts                  |  1 +
 .../modals/rollback/rollback-modal.element.ts | 19 ++++++++++++-------
 ...ent-workspace-view-info-history.element.ts | 11 +++++------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts
index 0d96709dcf..e883fdf02f 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts
@@ -834,6 +834,7 @@ export default {
 		submit: 'Indsend',
 		type: 'Type',
 		typeToSearch: 'Skriv for at søge...',
+		unknownUser: 'Ukendt bruger',
 		under: 'under',
 		up: 'Op',
 		update: 'Opdatér',
diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
index 40987bee26..134793b2f5 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
@@ -842,6 +842,7 @@ export default {
 		type: 'Type',
 		typeName: 'Type Name',
 		typeToSearch: 'Type to search...',
+		unknownUser: 'Unknown user',
 		under: 'under',
 		up: 'Up',
 		update: 'Update',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/rollback-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/rollback-modal.element.ts
index 5cf75abeff..bb44d9365d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/rollback-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/rollback-modal.element.ts
@@ -98,7 +98,8 @@ export class UmbRollbackModalElement extends UmbModalBaseElement<UmbRollbackModa
 		data?.items.forEach((item: any) => {
 			tempItems.push({
 				date: item.versionDate,
-				user: userItems?.find((user) => user.unique === item.user.id)?.name || 'Unknown user',
+				user:
+					userItems?.find((user) => user.unique === item.user.id)?.name || this.localize.term('general_unknownUser'),
 				isCurrentlyPublishedVersion: item.isCurrentPublishedVersion,
 				id: item.id,
 				preventCleanup: item.preventCleanup,
@@ -286,12 +287,16 @@ export class UmbRollbackModalElement extends UmbModalBaseElement<UmbRollbackModa
 					<uui-box headline=${this.currentVersionHeader} id="box-right"> ${this.#renderCurrentVersion()} </uui-box>
 				</div>
 				<umb-footer-layout slot="footer">
-					<uui-button slot="actions" look="secondary" @click=${this.#onCancel}
-						>${this.localize.term('general_cancel')}</uui-button
-					>
-					<uui-button slot="actions" look="primary" @click=${this.#onRollback}
-						>${this.localize.term('general_cancel')}</uui-button
-					>
+					<uui-button
+						slot="actions"
+						look="secondary"
+						@click=${this.#onCancel}
+						label=${this.localize.term('general_cancel')}></uui-button>
+					<uui-button
+						slot="actions"
+						look="primary"
+						@click=${this.#onRollback}
+						label=${this.localize.term('actions_rollback')}></uui-button>
 				</umb-footer-layout>
 			</umb-body-layout>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts
index 36c6aee92e..216c381979 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts
@@ -17,6 +17,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { AuditLogWithUsernameResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
 import { DirectionModel } from '@umbraco-cms/backoffice/external/backend-api';
 import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
 
 @customElement('umb-document-workspace-view-info-history')
 export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
@@ -94,11 +95,10 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
 		const modalManagerContext = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
 		const modalContext = modalManagerContext.open(this, UMB_ROLLBACK_MODAL, {});
 
-		if (!modalContext) return;
-
-		modalContext.onSubmit().then(() => {
-			console.log('Rollback modal submitted');
-		});
+		await modalContext.onSubmit();
+		// TODO: This notification won't actually show at the moment because we perform a full page reload after rollback. However, when we can do it without a full page reload, this should be used.
+		const notificationContext = await this.getContext(UMB_NOTIFICATION_CONTEXT);
+		notificationContext.peek('positive', { data: { message: this.localize.term('rollback_documentRolledBack') } });
 	};
 
 	render() {
@@ -111,7 +111,6 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
 						slot="actions"
 						@click=${this.#onRollbackModalOpen}>
 						<uui-icon name="icon-undo"></uui-icon>
-						<umb-localize key="actions_rollback"></umb-localize>
 					</uui-button>
 				</div>
 				${this._items ? this.#renderHistory() : html`<uui-loader-circle></uui-loader-circle> `}