move active path logic into workspace route manager

Author: madsrasmussen

src/packages/core/workspace/controllers/workspace-route-manager.controller.ts

@@ -1,6 +1,6 @@
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
-import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
-import type { UmbRoute } from '@umbraco-cms/backoffice/router';
+import { UmbArrayState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
+import type { IComponentRoute, UmbRoute } from '@umbraco-cms/backoffice/router';
 
 /**
  * The workspace route manager.
@@ -12,19 +12,38 @@ export class UmbWorkspaceRouteManager extends UmbControllerBase {
 	#routes = new UmbArrayState<UmbRoute>([], (x) => x.path);
 	public readonly routes = this.#routes.asObservable();
 
+	#activeLocalPath = new UmbStringState('');
+
 	/**
 	 * Set the routes for the workspace.
 	 * @param {Array<UmbRoute>} routes The routes for the workspace.
 	 * @memberof UmbWorkspaceRouteManager
 	 */
 	setRoutes(routes: Array<UmbRoute>) {
-		this.#routes.setValue([
+		const allRoutes = [
 			...routes,
 			{
 				path: `**`,
 				component: async () => (await import('@umbraco-cms/backoffice/router')).UmbRouteNotFoundElement,
 			},
-		]);
+		] as Array<IComponentRoute>;
+
+		const mappedRoutes = allRoutes.map((route) => {
+			// override the setup method to set the active local path
+			const oldSetupCallback = route.setup;
+
+			route.setup = (_component: any, info: any) => {
+				this.#activeLocalPath.setValue(info.match.fragments.consumed);
+
+				if (oldSetupCallback) {
+					oldSetupCallback(_component, info);
+				}
+			};
+
+			return route;
+		});
+
+		this.#routes.setValue([...mappedRoutes]);
 	}
 
 	/**
@@ -35,4 +54,13 @@ export class UmbWorkspaceRouteManager extends UmbControllerBase {
 	getRoutes(): Array<UmbRoute> {
 		return this.#routes.getValue();
 	}
+
+	/**
+	 * Get the active local path.
+	 * @returns {*}  {string}
+	 * @memberof UmbWorkspaceRouteManager
+	 */
+	getActiveLocalPath(): string {
+		return this.#activeLocalPath.getValue();
+	}
 }

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

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

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

@@ -90,7 +90,6 @@ 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 } });
@@ -106,7 +105,6 @@ 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);
 				},

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

@@ -33,8 +33,7 @@ export class UmbLanguageWorkspaceContext
 			{
 				path: 'create',
 				component: UmbLanguageWorkspaceEditorElement,
-				setup: async (_component, info) => {
-					this._setActivePathSegment(info.match.fragments.consumed);
+				setup: async () => {
 					this.create({ parent: { entityType: UMB_LANGUAGE_ROOT_ENTITY_TYPE, unique: null } });
 
 					new UmbWorkspaceIsNewRedirectController(
@@ -50,7 +49,6 @@ export class UmbLanguageWorkspaceContext
 				setup: (_component, info) => {
 					this.removeUmbControllerByAlias('isNewRedirectController');
 					this.load(info.match.params.unique);
-					this._setActivePathSegment(info.match.fragments.consumed);
 				},
 			},
 		]);

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

@@ -47,8 +47,7 @@ export class UmbUserWorkspaceContext
 			{
 				path: 'edit/:id',
 				component: UmbUserWorkspaceEditorElement,
-				setup: (component, info) => {
-					this._setActivePathSegment(info.match.fragments.consumed);
+				setup: (_component, info) => {
 					const id = info.match.params.id;
 					this.load(id);
 				},