clean up

Author: madsrasmussen

src/packages/documents/documents/rollback/entity-action/manifests.ts

@@ -1,5 +1,6 @@
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js';
 import { UMB_USER_PERMISSION_DOCUMENT_ROLLBACK } from '../../user-permissions/index.js';
+import { UMB_DOCUMENT_WORKSPACE_ALIAS } from '../../workspace/index.js';
 import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin';
 import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
@@ -24,6 +25,12 @@ export const manifests: Array<ManifestTypes> = [
 			{
 				alias: UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS,
 			},
+			/* Currently the rollback is tightly coupled to the workspace contexts so we only allow it to show up
+			 In the document workspace. */
+			{
+				alias: 'Umb.Condition.WorkspaceAlias',
+				match: UMB_DOCUMENT_WORKSPACE_ALIAS,
+			},
 		],
 	},
 ];

src/packages/documents/documents/rollback/entity-action/rollback.action.ts

@@ -1,14 +1,21 @@
-import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action';
+import { UMB_ROLLBACK_MODAL } from '../modal/rollback-modal.token.js';
 import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
-import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
+import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
 
 export class UmbRollbackDocumentEntityAction extends UmbEntityActionBase<never> {
-	constructor(host: UmbControllerHost, args: UmbEntityActionArgs<never>) {
-		super(host, args);
-	}
+	#localize = new UmbLocalizationController(this);
 
 	override async execute() {
-		debugger;
+		const modalManagerContext = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
+		const modalContext = modalManagerContext.open(this, UMB_ROLLBACK_MODAL, {});
+
+		await modalContext.onSubmit();
+		const notificationContext = await this.getContext(UMB_NOTIFICATION_CONTEXT);
+		notificationContext.peek('positive', {
+			data: { message: this.#localize.term('rollback_documentRolledBack') },
+		});
 	}
 }
 

src/packages/documents/documents/rollback/manifests.ts

@@ -1,9 +1,6 @@
 import { manifests as entityActionManifests } from './entity-action/manifests.js';
 import { manifests as modalManifests } from './modal/manifests.js';
 import { manifests as repositoryManifests } from './repository/manifests.js';
+import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<UmbExtensionManifest> = [
-	...entityActionManifests,
-	...modalManifests,
-	...repositoryManifests,
-];
+export const manifests: Array<ManifestTypes> = [...entityActionManifests, ...modalManifests, ...repositoryManifests];

src/packages/documents/documents/workspace/constants.ts

@@ -0,0 +1 @@
+export const UMB_DOCUMENT_WORKSPACE_ALIAS = 'Umb.Workspace.Document';

src/packages/documents/documents/workspace/document-workspace.context.ts

@@ -26,7 +26,7 @@ import {
 import { UMB_DOCUMENTS_SECTION_PATH } from '../../section/paths.js';
 import { UmbDocumentPreviewRepository } from '../repository/preview/index.js';
 import { sortVariants } from '../utils.js';
-import { UMB_DOCUMENT_WORKSPACE_ALIAS } from './manifests.js';
+import { UMB_DOCUMENT_WORKSPACE_ALIAS } from './constants.js';
 import { UmbEntityContext } from '@umbraco-cms/backoffice/entity';
 import { UMB_INVARIANT_CULTURE, UmbVariantId } from '@umbraco-cms/backoffice/variant';
 import { UmbContentTypeStructureManager } from '@umbraco-cms/backoffice/content-type';

src/packages/documents/documents/workspace/index.ts

@@ -1,2 +1,3 @@
 export * from './document-workspace.context-token.js';
 export * from './document-workspace.context.js';
+export * from './constants.js';

src/packages/documents/documents/workspace/manifests.ts

@@ -4,6 +4,7 @@ import {
 	UMB_USER_PERMISSION_DOCUMENT_PUBLISH,
 } from '../user-permissions/index.js';
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js';
+import { UMB_DOCUMENT_WORKSPACE_ALIAS } from './constants.js';
 import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin';
 import type {
 	ManifestWorkspaces,
@@ -14,8 +15,6 @@ import type {
 } from '@umbraco-cms/backoffice/extension-registry';
 import { UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION } from '@umbraco-cms/backoffice/content';
 
-export const UMB_DOCUMENT_WORKSPACE_ALIAS = 'Umb.Workspace.Document';
-
 const workspace: ManifestWorkspaces = {
 	type: 'workspace',
 	kind: 'routable',
@@ -41,7 +40,7 @@ const workspaceViews: Array<ManifestWorkspaceView> = [
 		conditions: [
 			{
 				alias: 'Umb.Condition.WorkspaceAlias',
-				match: workspace.alias,
+				match: UMB_DOCUMENT_WORKSPACE_ALIAS,
 			},
 			{
 				alias: 'Umb.Condition.WorkspaceHasCollection',
@@ -62,7 +61,7 @@ const workspaceViews: Array<ManifestWorkspaceView> = [
 		conditions: [
 			{
 				alias: 'Umb.Condition.WorkspaceAlias',
-				match: workspace.alias,
+				match: UMB_DOCUMENT_WORKSPACE_ALIAS,
 			},
 			{
 				alias: UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION,
@@ -83,7 +82,7 @@ const workspaceViews: Array<ManifestWorkspaceView> = [
 		conditions: [
 			{
 				alias: 'Umb.Condition.WorkspaceAlias',
-				match: workspace.alias,
+				match: UMB_DOCUMENT_WORKSPACE_ALIAS,
 			},
 		],
 	},
@@ -105,7 +104,7 @@ const workspaceActions: Array<ManifestWorkspaceActions> = [
 		conditions: [
 			{
 				alias: 'Umb.Condition.WorkspaceAlias',
-				match: workspace.alias,
+				match: UMB_DOCUMENT_WORKSPACE_ALIAS,
 			},
 			{
 				alias: UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS,
@@ -127,7 +126,7 @@ const workspaceActions: Array<ManifestWorkspaceActions> = [
 		conditions: [
 			{
 				alias: 'Umb.Condition.WorkspaceAlias',
-				match: workspace.alias,
+				match: UMB_DOCUMENT_WORKSPACE_ALIAS,
 			},
 			{
 				alias: UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS,
@@ -147,7 +146,7 @@ const workspaceActions: Array<ManifestWorkspaceActions> = [
 		conditions: [
 			{
 				alias: 'Umb.Condition.WorkspaceAlias',
-				match: workspace.alias,
+				match: UMB_DOCUMENT_WORKSPACE_ALIAS,
 			},
 			{
 				alias: UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS,

src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts

@@ -66,16 +66,6 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
 		this.#requestAuditLogs();
 	}
 
-	#onRollbackModalOpen = async () => {
-		const modalManagerContext = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-		const modalContext = modalManagerContext.open(this, UMB_ROLLBACK_MODAL, {});
-
-		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') } });
-	};
-
 	async #requestAndCacheUserItems() {
 		const allUsers = this._items?.map((item) => item.user.unique).filter(Boolean) as string[];
 		const uniqueUsers = [...new Set(allUsers)];
@@ -98,12 +88,10 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
 	override render() {
 		return html`<uui-box>
 			<umb-localize slot="headline" key="general_history">History</umb-localize>
-			<uui-button
+			<umb-extension-with-api-slot
 				slot="header-actions"
-				label=${this.localize.term('actions_rollback')}
-				look="secondary"
-				@click=${this.#onRollbackModalOpen}>
-				<uui-icon name="icon-undo"></uui-icon> ${this.localize.term('actions_rollback')}
+				type="entityAction"
+				.filter=${(manifest: any) => manifest.alias === 'Umb.EntityAction.Document.Rollback'}></umb-extension-with-api-slot>
 			</uui-button>
 			${this._items ? this.#renderHistory() : html`<uui-loader-circle></uui-loader-circle> `}
 			${this.#renderPagination()}