add local path checks

Author: madsrasmussen

src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts

@@ -174,17 +174,8 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	 * @memberof UmbEntityWorkspaceContextBase
 	 */
 	protected _checkWillNavigateAway(newUrl: string) {
-		let willNavigateAway = false;
-
 		const workspacePathBase = UMB_WORKSPACE_PATH_PATTERN.generateLocal({ entityType: this.getEntityType() });
-
-		if (this.getIsNew()) {
-			willNavigateAway = !newUrl.includes(`${workspacePathBase}/create`);
-		} else {
-			willNavigateAway = !newUrl.includes(`${workspacePathBase}/edit/${this.getUnique()}`);
-		}
-
-		return willNavigateAway;
+		return !newUrl.includes('/' + workspacePathBase);
 	}
 
 	#onWillNavigate = async (e: CustomEvent) => {

src/packages/data-type/workspace/data-type-workspace.context.ts

@@ -12,6 +12,7 @@ import {
 	UmbInvariantWorkspacePropertyDatasetContext,
 	UmbWorkspaceIsNewRedirectController,
 	UmbEntityDetailWorkspaceContextBase,
+	UMB_WORKSPACE_PATH_PATTERN,
 } from '@umbraco-cms/backoffice/workspace';
 import { appendToFrozenArray, UmbArrayState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
@@ -92,7 +93,7 @@ export class UmbDataTypeWorkspaceContext
 				setup: (_component, info) => {
 					const parentEntityType = info.match.params.entityType;
 					const parentUnique = info.match.params.parentUnique === 'null' ? null : info.match.params.parentUnique;
-					this.create({ entityType: parentEntityType, unique: parentUnique });
+					this.create({ parent: { entityType: parentEntityType, unique: parentUnique } });
 
 					new UmbWorkspaceIsNewRedirectController(
 						this,
@@ -112,11 +113,21 @@ export class UmbDataTypeWorkspaceContext
 		]);
 	}
 
+	protected override _checkWillNavigateAway(newUrl: string): boolean {
+		super._checkWillNavigateAway(newUrl);
+
+		const workspacePathBase = UMB_WORKSPACE_PATH_PATTERN.generateLocal({ entityType: this.getEntityType() });
+
+		if (this.getIsNew()) {
+			return !newUrl.includes(`${workspacePathBase}/create`);
+		} else {
+			return !newUrl.includes(`${workspacePathBase}/edit/${this.getUnique()}`);
+		}
+	}
+
 	override async load(unique: string) {
 		const response = await super.load(unique);
-
 		this.observe(response.asObservable?.(), (entity) => this.#onStoreChange(entity), 'umbDataTypeStoreObserver');
-
 		return response;
 	}
 

src/packages/language/workspace/language/language-workspace.context.ts

@@ -8,6 +8,7 @@ import {
 	UmbWorkspaceIsNewRedirectController,
 	type UmbRoutableWorkspaceContext,
 	UmbEntityDetailWorkspaceContextBase,
+	UMB_WORKSPACE_PATH_PATTERN,
 } from '@umbraco-cms/backoffice/workspace';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
@@ -54,6 +55,18 @@ export class UmbLanguageWorkspaceContext
 		]);
 	}
 
+	protected override _checkWillNavigateAway(newUrl: string): boolean {
+		super._checkWillNavigateAway(newUrl);
+
+		const workspacePathBase = UMB_WORKSPACE_PATH_PATTERN.generateLocal({ entityType: this.getEntityType() });
+
+		if (this.getIsNew()) {
+			return !newUrl.includes(`${workspacePathBase}/create`);
+		} else {
+			return !newUrl.includes(`${workspacePathBase}/edit/${this.getUnique()}`);
+		}
+	}
+
 	setName(name: string) {
 		this._data.updateCurrentData({ name });
 	}

src/packages/user/user/workspace/user/user-workspace.context.ts

@@ -7,7 +7,7 @@ import { UmbUserConfigRepository } from '../../repository/config/index.js';
 import { UMB_USER_WORKSPACE_ALIAS } from './constants.js';
 import { UmbUserWorkspaceEditorElement } from './user-workspace-editor.element.js';
 import type { UmbSubmittableWorkspaceContext } from '@umbraco-cms/backoffice/workspace';
-import { UmbEntityDetailWorkspaceContextBase } from '@umbraco-cms/backoffice/workspace';
+import { UMB_WORKSPACE_PATH_PATTERN, UmbEntityDetailWorkspaceContextBase } from '@umbraco-cms/backoffice/workspace';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
 
@@ -52,6 +52,18 @@ export class UmbUserWorkspaceContext
 		]);
 	}
 
+	protected override _checkWillNavigateAway(newUrl: string): boolean {
+		super._checkWillNavigateAway(newUrl);
+
+		const workspacePathBase = UMB_WORKSPACE_PATH_PATTERN.generateLocal({ entityType: this.getEntityType() });
+
+		if (this.getIsNew()) {
+			return !newUrl.includes(`${workspacePathBase}/create`);
+		} else {
+			return !newUrl.includes(`${workspacePathBase}/edit/${this.getUnique()}`);
+		}
+	}
+
 	override async load(unique: string) {
 		const response = await super.load(unique);