yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move discard changes logic

Browse Source
This commit is contained in:
Mads Rasmussen
2024-09-24 13:23:27 +02:00
parent 835e68703c
commit fbbbc5e93b
2 changed files with 60 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity/entity-workspace-base.ts
View File

@@ -1,9 +1,69 @@
import { UmbSubmittableWorkspaceContextBase } from '../submittable/index.js';
import { UmbEntityWorkspaceDataManager } from './entity-workspace-data-manager.js';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { UMB_DISCARD_CHANGES_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
export abstract class UmbEntityWorkspaceContextBase<
EntityModelType extends UmbEntityModel,
> extends UmbSubmittableWorkspaceContextBase<EntityModelType> {
/**
* @description Data manager for the workspace.
* @protected
* @memberof UmbEntityWorkspaceContextBase
*/
protected readonly _data = new UmbEntityWorkspaceDataManager<EntityModelType>(this);
constructor(host: UmbControllerHost, workspaceAlias: string) {
super(host, workspaceAlias);
window.addEventListener('willchangestate', this.#onWillNavigate);
}
/**
* @description method to check if the workspace is about to navigate away.
* @protected
* @param {string} newUrl
* @returns {*}
* @memberof UmbEntityWorkspaceContextBase
*/
protected _checkWillNavigateAway(newUrl: string) {
let willNavigateAway = false;
if (this.getIsNew()) {
willNavigateAway = !newUrl.includes(`${this.getEntityType()}/create`);
} else {
willNavigateAway = !newUrl.includes(this.getUnique()!);
}
return willNavigateAway;
}
#onWillNavigate = async (e: CustomEvent) => {
const newUrl = e.detail.url;
if (this._checkWillNavigateAway(newUrl) && this._data.hasUnpersistedChanges()) {
e.preventDefault();
const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
const modal = modalManager.open(this, UMB_DISCARD_CHANGES_MODAL);
try {
// navigate to the new url when discarding changes
await modal.onSubmit();
// Reset the current data so we don't end in a endless loop of asking to discard changes.
this._data.resetCurrentData();
history.pushState({}, '', e.detail.url);
return true;
} catch {
return false;
}
}
return true;
};
public override destroy(): void {
this._data.destroy();
window.removeEventListener('willchangestate', this.#onWillNavigate);
super.destroy();
}
}

36
src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts
View File

@@ -98,7 +98,6 @@ export class UmbDataTypeWorkspaceContext
constructor(host: UmbControllerHost) {
super(host, 'Umb.Workspace.DataType');
window.addEventListener('willchangestate', this.#onWillNavigate);
this.addValidationContext(new UmbValidationContext(this));
this.#observePropertyEditorSchemaAlias();
@@ -429,46 +428,11 @@ export class UmbDataTypeWorkspaceContext
await this.repository.delete(unique);
}
#willNavigateAway(newUrl: string) {
let willNavigateAway = false;
if (this.getIsNew()) {
willNavigateAway = !newUrl.includes(`${this.getEntityType()}/create`);
} else {
willNavigateAway = !newUrl.includes(this.getUnique()!);
}
return willNavigateAway;
}
#onWillNavigate = async (e: CustomEvent) => {
const newUrl = e.detail.url;
if (this.#willNavigateAway(newUrl) && this._data.hasUnpersistedChanges()) {
e.preventDefault();
const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
const modal = modalManager.open(this, UMB_DISCARD_CHANGES_MODAL);
try {
// navigate to the new url when discarding changes
await modal.onSubmit();
// Reset the current data so we don't end in a endless loop of asking to discard changes.
this._data.resetCurrentData();
history.pushState({}, '', e.detail.url);
return true;
} catch {
return false;
}
}
};
public override destroy(): void {
this._data.destroy();
this.#properties.destroy();
this.#propertyEditorUiIcon.destroy();
this.#propertyEditorUiName.destroy();
this.repository.destroy();
window.removeEventListener('willchangestate', this.#onWillNavigate);
super.destroy();
}
}