don't hard code path checks

Author: madsrasmussen

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

@@ -45,6 +45,8 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined));
 	readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined));
 
+	#activePathSegment = '';
+
 	#initResolver?: () => void;
 	#initialized = false;
 
@@ -166,6 +168,14 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 		await this._detailRepository!.delete(unique);
 	}
 
+	protected _setActivePathSegment(segment: string) {
+		this.#activePathSegment = segment;
+	}
+
+	protected _getActivePathSegment() {
+		return this.#activePathSegment;
+	}
+
 	/**
 	 * @description method to check if the workspace is about to navigate away.
 	 * @protected
@@ -174,8 +184,9 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	 * @memberof UmbEntityWorkspaceContextBase
 	 */
 	protected _checkWillNavigateAway(newUrl: string) {
-		const workspacePathBase = UMB_WORKSPACE_PATH_PATTERN.generateLocal({ entityType: this.getEntityType() });
-		return !newUrl.includes('/' + workspacePathBase);
+		const workspaceBasePath = UMB_WORKSPACE_PATH_PATTERN.generateLocal({ entityType: this.getEntityType() });
+		const currentWorkspacePathIdentifier = '/' + workspaceBasePath + '/' + this._getActivePathSegment();
+		return !newUrl.includes(currentWorkspacePathIdentifier);
 	}
 
 	#onWillNavigate = async (e: CustomEvent) => {

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

@@ -90,6 +90,7 @@ export class UmbDataTypeWorkspaceContext
 				path: 'create/parent/:entityType/:parentUnique',
 				component: UmbDataTypeWorkspaceEditorElement,
 				setup: (_component, info) => {
+					this._setActivePathSegment(info.match.fragments.consumed);
 					const parentEntityType = info.match.params.entityType;
 					const parentUnique = info.match.params.parentUnique === 'null' ? null : info.match.params.parentUnique;
 					this.create({ parent: { entityType: parentEntityType, unique: parentUnique } });
@@ -105,21 +106,14 @@ export class UmbDataTypeWorkspaceContext
 				path: 'edit/:unique',
 				component: UmbDataTypeWorkspaceEditorElement,
 				setup: (_component, info) => {
+					this._setActivePathSegment(info.match.fragments.consumed);
 					const unique = info.match.params.unique;
 					this.load(unique);
 				},
 			},
 		]);
 	}
 
-	protected override _checkWillNavigateAway(newUrl: string): boolean {
-		if (this.getIsNew()) {
-			return !newUrl.includes(`/create`) || super._checkWillNavigateAway(newUrl);
-		} else {
-			return !newUrl.includes(`/edit/${this.getUnique()}`) || super._checkWillNavigateAway(newUrl);
-		}
-	}
-
 	override async load(unique: string) {
 		const response = await super.load(unique);
 		this.observe(response.asObservable?.(), (entity) => this.#onStoreChange(entity), 'umbDataTypeStoreObserver');

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

@@ -48,21 +48,14 @@ export class UmbUserWorkspaceContext
 				path: 'edit/:id',
 				component: UmbUserWorkspaceEditorElement,
 				setup: (component, info) => {
+					this._setActivePathSegment(info.match.fragments.consumed);
 					const id = info.match.params.id;
 					this.load(id);
 				},
 			},
 		]);
 	}
 
-	protected override _checkWillNavigateAway(newUrl: string): boolean {
-		if (this.getIsNew()) {
-			return !newUrl.includes(`/create`) || super._checkWillNavigateAway(newUrl);
-		} else {
-			return !newUrl.includes(`/edit/${this.getUnique()}`) || super._checkWillNavigateAway(newUrl);
-		}
-	}
-
 	override async load(unique: string) {
 		const response = await super.load(unique);