use addendum

Author: nielslyngsoe

src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot.element.ts

@@ -1,4 +1,5 @@
 import '@umbraco-cms/backoffice/external/router-slot';
+import { UmbRoutePathAddendumResetContext } from '../../contexts/route-path-addendum-reset.context.js';
 import { UmbRouterSlotInitEvent } from './router-slot-init.event.js';
 import { UmbRouterSlotChangeEvent } from './router-slot-change.event.js';
 import type { UmbRoute } from './route.interface.js';
@@ -61,6 +62,9 @@ export class UmbRouterSlotElement extends UmbLitElement {
 
 	constructor() {
 		super();
+
+		new UmbRoutePathAddendumResetContext(this);
+
 		this.#modalRouter.parent = this.#router;
 		this.#modalRouter.style.display = 'none';
 		this.#router.addEventListener('changestate', this._updateRouterPath.bind(this));

src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.controller.ts

@@ -1,4 +1,4 @@
-import { UMB_ROUTE_CONTEXT } from '../index.js';
+import { UMB_ROUTE_CONTEXT, UMB_ROUTE_PATH_ADDENDUM_CONTEXT } from '../index.js';
 import { encodeFolderName } from '../encode-folder-name.function.js';
 import type { UmbModalRouteRegistration } from './modal-route-registration.interface.js';
 import type {
@@ -51,6 +51,7 @@ export class UmbModalRouteRegistrationController<
 	#init;
 	#contextConsumer;
 
+	#addendum?: string;
 	#additionalPath?: string;
 	#uniquePaths: Map<string, string | undefined> = new Map();
 
@@ -89,9 +90,19 @@ export class UmbModalRouteRegistrationController<
 		super(host, ctrlAlias ?? alias.toString());
 		this.#key = UmbId.new();
 		this.#modalAlias = alias;
-		//this.#path = path;
 
-		this.#contextConsumer = new UmbContextConsumerController(this, UMB_ROUTE_CONTEXT, (_routeContext) => {
+		this.consumeContext(UMB_ROUTE_PATH_ADDENDUM_CONTEXT, (context) => {
+			this.observe(
+				context.addendum,
+				(addendum) => {
+					this.#addendum = addendum;
+					this.#registerModal();
+				},
+				'observeAddendum',
+			);
+		});
+
+		this.#contextConsumer = this.consumeContext(UMB_ROUTE_CONTEXT, (_routeContext) => {
 			this.#routeContext = _routeContext;
 			this.#registerModal();
 		});
@@ -176,6 +187,7 @@ export class UmbModalRouteRegistrationController<
 	async #registerModal() {
 		await this.#init;
 		if (!this.#routeContext) return;
+		if (this.#addendum === undefined) return;
 
 		const pathParts = Array.from(this.#uniquePaths.values());
 
@@ -184,6 +196,11 @@ export class UmbModalRouteRegistrationController<
 			this.#unregisterModal();
 		}
 
+		if (this.#addendum !== '') {
+			// append in the start of pathParts:
+			pathParts.unshift(this.#addendum);
+		}
+
 		if (this.#additionalPath) {
 			// Add the configured part of the path:
 			pathParts.push(this.#additionalPath);