@luigi-project/core-modular 0.0.19 → 0.0.20-dev.202610210048

package/core-api/navigation.d.ts

@@ -11,7 +11,7 @@ export declare class Navigation {
     modalService: ModalService;
     options: NavigationOptions;
     constructor(luigi: Luigi);
-    navigate: (path: string, preserveView?: string, modalSettings?: ModalSettings, splitViewSettings?: any, drawerSettings?: any) => Promise<void>;
+    navigate: (path: string, preserveView?: boolean, modalSettings?: ModalSettings, splitViewSettings?: any, drawerSettings?: any) => Promise<void>;
     /**
      * Offers an alternative way of navigating with intents. This involves specifying a semanticSlug and an object containing parameters.
      * @param {string} semanticSlug - concatenation of semantic object and action connected with a dash (-), i.e.: `<semanticObject>-<action>`
@@ -38,6 +38,19 @@ export declare class Navigation {
      *  );
      */
     pathExists: (path: string) => Promise<boolean>;
+    /**
+     * Checks if there is one or more preserved views. You can use it to show a **back** button.
+     * @returns {boolean} indicating if there is a preserved view you can return to
+     */
+    hasBack: () => boolean;
+    /**
+     * Discards the active view and navigates back to the last visited view. Works with preserved views, and also acts as the substitute of the browser **back** button. **goBackContext** is only available when using preserved views.
+     * @param {any} goBackValue - data that is passed in the **goBackContext** field to the last visited view when using preserved views
+     * @example
+     * Luigi.navigation().goBack({ foo: 'bar' });
+     * Luigi.navigation().goBack(true);
+     */
+    goBack: (goBackValue?: any) => void;
     /**
      * Sets the current navigation base to the parent node that is defined as virtualTree. This method works only when the currently active micro frontend is inside a virtualTree.
      * @returns {Navigation} navigation instance

package/luigi-engine.d.ts

@@ -13,11 +13,11 @@ export declare class LuigiEngine {
         drawerContainer: any;
         init: (luigi: import('./core-api/luigi').Luigi) => void;
         update: (scopes?: string[]) => Promise<void>;
-        updateMainContent: (currentNode: import('./types/navigation').Node, luigi: import('./core-api/luigi').Luigi, luigiParams?: import('./types/routing').LuigiParams, withoutSync?: boolean, preventContextUpdate?: boolean) => Promise<void>;
+        updateMainContent: (currentNode: import('./types/navigation').Node, luigi: import('./core-api/luigi').Luigi, luigiParams?: import('./types/routing').LuigiParams, withoutSync?: boolean, preventContextUpdate?: boolean, preserveView?: boolean) => Promise<void>;
         openModal: (luigi: import('./core-api/luigi').Luigi, node: import('./types/navigation').Node, modalSettings: import('./types/navigation').ModalSettings, onCloseCallback?: (goBackValue?: any) => void, luigiParams?: import('./types/routing').LuigiParams) => Promise<void>;
         updateModalSettings: (modalSettings: import('./types/navigation').ModalSettings, addHistoryEntry: boolean, luigi: import('./core-api/luigi').Luigi) => void;
-        openDrawer: (luigi: import('./core-api/luigi').Luigi, node: import('./types/navigation').Node, drawerSettings: import('./types/navigation').DrawerSettings, onCloseCallback?: () => void, luigiParams?: import('./types/routing').LuigiParams) => Promise<void>;
-        openUserSettings: (userSettingsDialogSettings: import('./types/navigation').UserSettingsDialogSettings, userSettingData: any, previousUserSettings: any, luigi: import('./core-api/luigi').Luigi) => Promise<void>;
+        openDrawer: (luigi: import('./core-api/luigi').Luigi, node: import('./types/navigation').Node, drawerSettings: import('./types/navigation').DrawerSettings, onCloseCallback?: (goBackValue?: any) => void, luigiParams?: import('./types/routing').LuigiParams) => Promise<void>;
+        openUserSettings: (userSettingsDialogSettings: import('./types/navigation').UserSettingsDialogSettings, userSettingData: any, previousUserSettings: any, initialUserSettings: any, luigi: import('./core-api/luigi').Luigi) => Promise<void>;
     };
     _comm: {
         luigi: import('./core-api/luigi').Luigi;

package/luigi.js

@@ -7481,6 +7481,15 @@ var fi = {
 		let t = this.getQueryParam(`${this.getModalViewParamName(e)}Params`, e);
 		return t && JSON.parse(t);
 	},
+	getBookmarkableModalParams(e) {
+		let t = {
+			size: e.size,
+			width: e.width,
+			height: e.height,
+			title: e.title
+		};
+		return e.keepPrevious && (t.keepPrevious = e.keepPrevious), t;
+	},
 	getHashQueryParamSeparator() {
 		return this.defaultQueryParamSeparator;
 	},
@@ -7891,8 +7900,10 @@ var fi = {
 	}
 }, yi = class {
 	luigi;
+	_preservedViews = [];
 	modalService;
 	nodeDataManagementService;
+	goBackContext = null;
 	previousBreadcrumbs = {};
 	constructor(e) {
 		this.luigi = e;
@@ -7903,6 +7914,61 @@ var fi = {
 	getNodeDataManagementService() {
 		return this.nodeDataManagementService ||= W.get(vi), this.nodeDataManagementService;
 	}
+	handleDialogContainer(e) {
+		let t = a.getNodeList("luigi-container[lui_container]", !0);
+		if (this.goBackContext = { goBackContext: e }, t?.length > 1) {
+			let n = t.filter((e) => !e.parentNode.classList.contains("content")).at(-1);
+			return n?.updateContext && n.updateContext({
+				...n.context,
+				goBackContext: e
+			}, { withoutSync: !1 }), !0;
+		} else return !1;
+	}
+	prepareGoBackContextForNavigation(e) {
+		(typeof e == "boolean" || e && typeof e == "object") && this.handleDialogContainer(e);
+	}
+	clearGoBackContext() {
+		this.goBackContext = null;
+	}
+	getGoBackContext() {
+		return this.goBackContext;
+	}
+	clearPreservedViews() {
+		this._preservedViews.length = 0;
+	}
+	removeLastPreservedView() {
+		this._preservedViews.length && this._preservedViews.pop();
+	}
+	getPreservedViewsLength() {
+		return this._preservedViews.length;
+	}
+	isValidBackRoute(e) {
+		if (this._preservedViews.length === 0) return !1;
+		let t = e.startsWith("/") ? e : `/${e}`, n = [...this._preservedViews].pop(), r = (e) => e.split("?")[0];
+		return [r(n.path), r(n.nextPath)].includes(r(t));
+	}
+	processGoBackContext(e) {
+		let t = (e) => {
+			let t = this.luigi.getEngine()._connector?.getContainerWrapper();
+			if (!t) return;
+			let n = [...t.childNodes].filter((e) => e.tagName?.indexOf("LUIGI-") === 0).find((e) => e.style?.display !== "none");
+			n?.updateContext && n.updateContext({
+				...n.context,
+				...e
+			}, { withoutSync: !1 });
+		};
+		typeof e == "boolean" || e && typeof e == "object" ? this.handleDialogContainer(e) || t({ goBackContext: e }) : (this.clearGoBackContext(), this.luigi.getConfigValue("routing.showModalPathInUrl") || t({}));
+	}
+	handleGoBackRequest(e) {
+		let t = e && typeof e == "string" ? JSON.parse(e) : e;
+		this.clearGoBackContext(), this.getPreservedViewsLength() > 0 ? W.get(gi).getUnsavedChangesModalPromise().then(() => {
+			let e = this._preservedViews.pop();
+			this.prepareGoBackContextForNavigation(t), e?.path && this.handleNavigationRequest({
+				path: e.path,
+				withoutSync: !1
+			});
+		}, () => {}) : (e && console.warn("Warning: goBack() does not support goBackContext value. This is available only when using the Luigi preserveView feature."), history.back());
+	}
 	async getPathData(e) {
 		let t = this.luigi.getConfig(), n = e?.split("/");
 		n?.length > 0 && n[0] === "" && (n = n.slice(1));
@@ -8368,6 +8434,14 @@ var fi = {
 			}
 		}
 		let v = _.replace(/\/\/+/g, "/"), y = d ? "replaceState" : "pushState", { path: b, query: x } = U.getCurrentPath(this.luigi, p), S = b + (x ? "?" + x : "");
+		if (i) {
+			let e = await this.getPathData(b);
+			this._preservedViews.push({
+				context: e.context,
+				nextPath: _.startsWith("/") ? _ : "/" + _,
+				path: e?.pathParams ? a.replaceVars(b, e.pathParams, ":", !1) : b
+			});
+		}
 		if (!(o || s) && a.trimLeadingSlash(S) === a.trimLeadingSlash(v)) {
 			let e = this.luigi.getEngine()._connector?.getContainerWrapper();
 			if (e?.childNodes) {
@@ -8386,6 +8460,7 @@ var fi = {
 		}
 		else {
 			let e = { detail: {
+				preserveView: !!i,
 				preventContextUpdate: !!u,
 				preventHistoryEntry: !!d,
 				withoutSync: !!l
@@ -8403,7 +8478,7 @@ var fi = {
 			let n = this.luigi.getConfigValue("routing.disableBrowserHistory") ? "replaceState" : y;
 			if (p) {
 				let t = a.addLeadingSlash(v);
-				if (!l && !u && n !== "replaceState") location.hash = t;
+				if (!l && !i && !u && n !== "replaceState") location.hash = t;
 				else {
 					let r = new CustomEvent("hashchange", e);
 					window.history[n]({ path: "/#" + t }, "", "/#" + t), window.dispatchEvent(r);
@@ -8637,15 +8712,15 @@ var fi = {
 	}
 	enableRouting() {
 		this.luigi.getConfig().routing?.useHashRouting ? (xi.addEventListener("hashchange", (e) => {
-			let t = !!e?.detail?.preventContextUpdate, n = !!e?.detail?.withoutSync;
-			this.handleRouteChange(U.getCurrentPath(this.luigi, !0, !0), n, t);
+			let t = !!e?.detail?.preserveView, n = !!e?.detail?.preventContextUpdate, r = !!e?.detail?.withoutSync;
+			this.handleRouteChange(U.getCurrentPath(this.luigi, !0, !0), r, n, t);
 		}), this.handleRouteChange(U.getCurrentPath(this.luigi, !0, !0))) : (xi.addEventListener("popstate", (e) => {
-			let t = !!e?.detail?.preventContextUpdate, n = !!e?.detail?.withoutSync;
-			this.handleRouteChange(U.getCurrentPath(this.luigi, !1, !0), n, t);
+			let t = !!e?.detail?.preserveView, n = !!e?.detail?.preventContextUpdate, r = !!e?.detail?.withoutSync;
+			this.handleRouteChange(U.getCurrentPath(this.luigi, !1, !0), r, n, t);
 		}), this.handleRouteChange(U.getCurrentPath(this.luigi, !1, !0)));
 	}
-	async handleRouteChange(e, t = !1, n = !1) {
-		let r = e.path, i = e.query, o = r + (i ? "?" + i : ""), s = new URLSearchParams(i), c = Object.create(null);
+	async handleRouteChange(e, t = !1, n = !1, r = !1) {
+		let i = e.path, o = e.query, s = i + (o ? "?" + o : ""), c = new URLSearchParams(o), l = Object.create(null);
 		try {
 			if (this.dirtyStatusService?.shouldShowUnsavedChangesModal()) {
 				let e = this.dirtyStatusService.unsavedChanges.persistUrl;
@@ -8656,31 +8731,31 @@ var fi = {
 			return;
 		}
 		if (this.shouldSkipRoutingForUrlPatterns()) return;
-		this.setFeatureToggle(o), await this.shouldShowModalPathInUrl(e), s.forEach((e, t) => {
-			c[t] = e;
-		}), this.checkInvalidateCache(this.previousPathData, r);
-		let l = await this.getNavigationService().getPathData(r), u = U.filterNodeParams(c, this.luigi), d = a.getPathWithoutHash(r) || "";
+		this.getNavigationService().isValidBackRoute(i) || this.getNavigationService().clearPreservedViews(), this.setFeatureToggle(s), await this.shouldShowModalPathInUrl(e), c.forEach((e, t) => {
+			l[t] = e;
+		}), this.checkInvalidateCache(this.previousPathData, i);
+		let u = await this.getNavigationService().getPathData(i), d = U.filterNodeParams(l, this.luigi), f = a.getPathWithoutHash(i) || "";
 		this.currentRoute = {
 			raw: window.location.href,
-			path: r,
-			nodeParams: u
+			path: i,
+			nodeParams: d
 		};
-		let f = l?.selectedNode ?? await this.getNavigationService().getCurrentNode(r), p = f?.viewUrl || "";
-		if (f && await this.handleViewUrlMisconfigured(f, p, this.previousPathData, d) || await this.handlePageNotFound(f, p, l, r, d)) {
+		let p = u?.selectedNode ?? await this.getNavigationService().getCurrentNode(i), m = p?.viewUrl || "";
+		if (p && await this.handleViewUrlMisconfigured(p, m, this.previousPathData, f) || await this.handlePageNotFound(p, m, u, i, f)) {
 			let e = this.luigi.getEngine()._connector;
-			e?.renderLeftNav(await this.getNavigationService().getLeftNavData(r, l)), e?.renderTabNav(await this.getNavigationService().getTabNavData(r, l));
+			e?.renderLeftNav(await this.getNavigationService().getLeftNavData(i, u)), e?.renderTabNav(await this.getNavigationService().getTabNavData(i, u));
 			return;
 		}
-		let m = this.luigi.getEngine()._connector;
-		if (m?.renderTopNav(await this.getNavigationService().getTopNavData(r, l)), m?.renderLeftNav(await this.getNavigationService().getLeftNavData(r, l)), m?.renderTabNav(await this.getNavigationService().getTabNavData(r, l)), m?.renderBreadcrumbs(await this.getNavigationService().getBreadcrumbData(r, l, (e) => {
-			m?.renderBreadcrumbs(e);
-		})), f) {
+		let h = this.luigi.getEngine()._connector;
+		if (h?.renderTopNav(await this.getNavigationService().getTopNavData(i, u)), h?.renderLeftNav(await this.getNavigationService().getLeftNavData(i, u)), h?.renderTabNav(await this.getNavigationService().getTabNavData(i, u)), h?.renderBreadcrumbs(await this.getNavigationService().getBreadcrumbData(i, u, (e) => {
+			h?.renderBreadcrumbs(e);
+		})), p) {
 			let e = {
-				nodeParams: u || {},
-				pathParams: l?.pathParams || {},
-				searchParams: U.prepareSearchParamsForClient(f, this.luigi)
+				nodeParams: d || {},
+				pathParams: u?.pathParams || {},
+				searchParams: U.prepareSearchParamsForClient(p, this.luigi)
 			};
-			this.currentRoute.node = f, this.getNavigationService().onNodeChange(this.previousNode, f), this.previousNode = f, await G.updateMainContent(f, this.luigi, e, t, n), this.previousPathData = l;
+			this.currentRoute.node = p, this.getNavigationService().onNodeChange(this.previousNode, p), this.previousNode = p, await G.updateMainContent(p, this.luigi, e, t, n, r), this.previousPathData = u;
 		}
 	}
 	getCurrentRoute() {
@@ -8708,7 +8783,9 @@ var fi = {
 			l = e, u = U.getURLWithoutModalData(t, i), u && (l += "?" + u);
 		} else l = o.pathname, u = U.getURLWithoutModalData(o.search, i), u && (l += "?" + U.getURLWithoutModalData(o.search, i));
 		if (c = U.handleHistoryState(c, l), a !== e) {
-			if (r[i] = e, t && Object.keys(t).length && (r[`${i}Params`] = JSON.stringify(t)), s) {
+			r[i] = e;
+			let a = U.getBookmarkableModalParams(t);
+			if (a && Object.keys(a).length && (r[`${i}Params`] = JSON.stringify(a)), s) {
 				let e = location.hash.indexOf(n);
 				e !== -1 && (o.hash = o.hash.slice(0, e)), o.hash = `${o.hash}${n}${U.encodeParams(r)}`;
 			} else o.search = `?${U.encodeParams(r)}`;
@@ -8754,13 +8831,15 @@ var fi = {
 	}
 	updateModalDataInUrl(e, t, n) {
 		let r = U.getHashQueryParamSeparator(), i = U.getQueryParams(this.luigi), a = U.getModalViewParamName(this.luigi);
-		i[a] = e, t && Object.keys(t).length && (i[`${a}Params`] = JSON.stringify(t));
-		let o = new URL(location.href);
+		i[a] = e;
+		let o = U.getBookmarkableModalParams(t);
+		o && Object.keys(o).length && (i[`${a}Params`] = JSON.stringify(o));
+		let s = new URL(location.href);
 		if (this.luigi.getConfigValue("routing.useHashRouting")) {
 			let e = location.hash.indexOf(r);
-			e !== -1 && (o.hash = o.hash.slice(0, e)), o.hash = `${o.hash}${r}${U.encodeParams(i)}`;
-		} else o.search = `?${U.encodeParams(i)}`;
-		n ? history.pushState(window.state, "", o.href) : history.replaceState(window.state, "", o.href);
+			e !== -1 && (s.hash = s.hash.slice(0, e)), s.hash = `${s.hash}${r}${U.encodeParams(i)}`;
+		} else s.search = `?${U.encodeParams(i)}`;
+		n ? history.pushState(window.state, "", s.href) : history.replaceState(window.state, "", s.href);
 	}
 	checkInvalidateCache(e, t) {
 		if (!e) return;
@@ -8940,40 +9019,55 @@ var fi = {
 			}
 		} else e.includes("settings.theming") && t.node && G.updateMainContent(t.node, G.luigi);
 	},
-	updateMainContent: async (e, t, n, r, i) => {
-		let o = await t.readUserSettings(), s = e.userSettingsGroup && typeof o == "object" && o && e.userSettingsGroup ? o[e.userSettingsGroup] : null, c = t.getEngine()._connector?.getContainerWrapper();
-		t.getEngine()._connector?.hideLoadingIndicator(c);
-		let l = n?.nodeParams || {}, u = n?.pathParams || {}, d = n?.searchParams || {};
-		if (e && c) {
-			let o, f, p;
-			(e.virtualTree || e._virtualTree) && (p = H.findVirtualTreeRootNode(e));
-			let m = e.viewUrl ? W.get(Ci).applyDecorators(U.substituteViewUrl(e, u, l, t), e.decodeViewUrl ?? !1) : "";
-			if ([...c.childNodes].forEach((n) => {
-				if (n.tagName?.indexOf("LUIGI-") === 0) if (r && (o = n), n.viewGroup && e.viewGroup !== n.viewGroup) {
+	updateMainContent: async (e, t, n, r, i, o) => {
+		let s = await t.readUserSettings(), c = e.userSettingsGroup && typeof s == "object" && s && e.userSettingsGroup ? s[e.userSettingsGroup] : null, l = t.getEngine()._connector?.getContainerWrapper();
+		t.getEngine()._connector?.hideLoadingIndicator(l);
+		let u = n?.nodeParams || {}, d = n?.pathParams || {}, f = n?.searchParams || {};
+		if (e && l) {
+			let s, p, m;
+			(e.virtualTree || e._virtualTree) && (m = H.findVirtualTreeRootNode(e));
+			let h = !!G.navService.getGoBackContext(), g = G.navService.getPreservedViewsLength(), _ = e.viewUrl ? W.get(Ci).applyDecorators(U.substituteViewUrl(e, d, u, t), e.decodeViewUrl ?? !1) : "";
+			if ([...l.childNodes].forEach((n) => {
+				if (n.tagName?.indexOf("LUIGI-") === 0) if (r && (s = n), n.viewGroup && e.viewGroup !== n.viewGroup) {
 					if (!r) {
 						n.style.display = "none";
 						let e = t.getConfigValue("navigation.viewGroupSettings")?.[n.viewGroup];
 						e?.preloadUrl && (n.viewurl = e.preloadUrl, n.context = {}, n.nodeParams = {}, n.pathParams = {});
 					}
-				} else r || n.viewGroup || n.virtualTree && p === n.virtualTreeRootNode || !e.viewGroup && !e.isolateView && !e.webcomponent && n.viewurl && (i || m && a.isSameUrl(n.viewurl, m)) ? f = n : r || n.remove();
-			}), f && f._luigiPreloading && (f._luigiPreloading = !1, W.get(bi).viewGroupLoaded(f)), f) {
-				let n = f.viewurl;
-				!r && !i && (f.style.display = "block", f.viewurl = m, f.nodeParams = l, f.pathParams = u, f.clientPermissions = e.clientPermissions, f.searchParams = d, f.locale = t.i18n().getCurrentLocale(), f.theme = t.theming().getCurrentTheme(), f.activeFeatureToggleList = t.featureToggles().getActiveFeatureToggleList(), f.userSettingsGroup = e.userSettingsGroup, f.userSettings = s, Ti(f, t), Ei(f, t)), r && !i && (f.nodeParams = l, f.pathParams = u, f.searchParams = d), i || (a.isSameUrl(n, m) && n !== m && !f.virtualTree && !r ? (f.context = e.context || {}, f.updateViewUrl(m)) : (f.updateContext(e.context || {}, { withoutSync: !!r }), await ki(e.context || {}, !!r, t)));
-			} else if (r) !i && o && (o.updateContext(e.context || {}, { withoutSync: r }), await ki(e.context || {}, !!r, t));
-			else {
-				let r = await wi(e, t, n, "main");
-				c?.appendChild(r);
-				let i = t.getEngine()._connector;
-				e.loadingIndicator?.enabled !== !1 && i?.showLoadingIndicator(c);
+				} else r || n.viewGroup || n.virtualTree && m === n.virtualTreeRootNode ? o || n._luigiPreserved && g ? (n._luigiPreserved = !h, n.style.display = "none") : (n._luigiPreserved = h, n.style.display = "block", p = n) : !e.viewGroup && !e.isolateView && !e.webcomponent && n.viewurl && (i || _ && a.isSameUrl(n.viewurl, _)) ? (n._luigiPreserved = !1, n.style.display = "block", p = n) : o ? (n._luigiPreserved = !0, n.style.display = "none") : !r && !n._luigiPreserved && n.remove();
+			}), p && p._luigiPreloading && (p._luigiPreloading = !1, W.get(bi).viewGroupLoaded(p)), p) {
+				let n = p.viewurl;
+				if (p.viewStackSize = g, !r && !i && (p.style.display = "block", p.viewurl = _, p.nodeParams = u, p.pathParams = d, p.clientPermissions = e.clientPermissions, p.searchParams = f, p.locale = t.i18n().getCurrentLocale(), p.theme = t.theming().getCurrentTheme(), p.activeFeatureToggleList = t.featureToggles().getActiveFeatureToggleList(), p.userSettingsGroup = e.userSettingsGroup, p.userSettings = c, Ti(p, t), Ei(p, t)), r && !i && (p.nodeParams = u, p.pathParams = d, p.searchParams = f), !i) {
+					let i = a.isSameUrl(n, _) && n !== _, o = G.navService.getGoBackContext() || {}, s = {
+						...e.context,
+						...o
+					};
+					i && !p.virtualTree && !r ? (p.context = s, p.updateViewUrl(_)) : (p.updateContext(s, { withoutSync: !!r }), await ki(s, !!r, t));
+				}
+			} else if (r) {
+				let n = G.navService.getGoBackContext() || {}, a = {
+					...e.context,
+					...n
+				};
+				s.viewStackSize = g, !i && s && (s.updateContext(a, { withoutSync: r }), await ki(a, !!r, t));
+			} else {
+				let r = await wi(e, t, n, "main"), i = t.getEngine()._connector;
+				r.viewStackSize = g, l?.appendChild(r), e.loadingIndicator?.enabled !== !1 && i?.showLoadingIndicator(l);
 			}
+			let v = [...l.childNodes];
+			if (h && !g && v.length > 1) {
+				let e = v.at(-1);
+				e && e.style.display === "none" && e.remove();
+			}
+			G.navService.clearGoBackContext();
 		}
 	},
 	openModal: async (e, t, n, r, i) => {
 		let a = await wi(t, e, i, "modal");
 		G.modalContainer.push(a);
 		let o = W.get(Si), s = W.get(_i), c = W.get(gi), l = !1, u, d, f = new Promise((t) => {
-			u = () => {
-				l || (l = !0, t(), s.removeLastModalFromStack());
+			u = (e) => {
+				l || (l = !0, t(), s.removeLastModalFromStack(), (typeof e == "boolean" || e && typeof e == "object") && (G.navService.removeLastPreservedView(), setTimeout(() => G.navService.processGoBackContext(e))));
 			}, d = async () => {
 				try {
 					await c.getUnsavedChangesModalPromise(a);
@@ -8988,13 +9082,7 @@ var fi = {
 					return;
 				}
 				let n = t?.detail || t?.payload;
-				if (r?.(n), u && u(), e.getConfigValue("routing.showModalPathInUrl") && s.getModalStackLength() === 0 && o.removeModalDataFromUrl(!0), n && Object.keys(n).length) {
-					let t = e.getEngine()._connector?.getContainerWrapper();
-					if (t) {
-						let e = [...t.childNodes].find((e) => e.tagName?.indexOf("LUIGI-") === 0 && e.style?.display !== "none");
-						e?.updateContext && e.updateContext({ goBackContext: n }, { withoutSync: !1 });
-					}
-				}
+				r?.(n), u && u(n), e.getConfigValue("routing.showModalPathInUrl") && s.getModalStackLength() === 0 && o.removeModalDataFromUrl(!0);
 			});
 		}), p = {
 			closePromise: f,
@@ -9037,8 +9125,8 @@ var fi = {
 		let o = await wi(t, e, i, "drawer");
 		G.drawerContainer = o;
 		let s = !1, c, l = new Promise((e) => {
-			c = () => {
-				s || (s = !0, e());
+			c = (t) => {
+				s || (s = !0, e(), (typeof t == "boolean" || t && typeof t == "object") && (G.navService.removeLastPreservedView(), setTimeout(() => G.navService.processGoBackContext(t))));
 			}, o.addEventListener(V.CLOSE_CURRENT_MODAL_REQUEST, async () => {
 				try {
 					await a.getUnsavedChangesModalPromise(o);
@@ -9046,6 +9134,14 @@ var fi = {
 					return;
 				}
 				G.drawerContainer = void 0, a.clearDirtyState(o), c && c();
+			}), o.addEventListener(V.GO_BACK_REQUEST, async (e) => {
+				try {
+					await a.getUnsavedChangesModalPromise(o);
+				} catch {
+					return;
+				}
+				let t = e?.detail || e?.payload;
+				r?.(t), c && c(t);
 			});
 		});
 		e.getEngine()._connector?.renderDrawer(o, n, async () => {
@@ -9059,29 +9155,29 @@ var fi = {
 		let u = e.getEngine()._connector;
 		t.loadingIndicator?.enabled !== !1 && u?.showLoadingIndicator(o.parentElement);
 	},
-	openUserSettings: async (e, t, n, r) => {
-		let i = {};
+	openUserSettings: async (e, t, n, r, i) => {
+		let a = {};
 		e.renderMicroFrontendContainer = async (e, t) => {
-			let a = e.viewUrl, o = e.webcomponent ?? !1, s = n?.[t] || {}, c = await wi({
-				viewUrl: a,
+			let r = e.viewUrl, o = e.webcomponent ?? !1, s = n?.[t] || {}, c = await wi({
+				viewUrl: r,
 				userSettingsGroup: t,
 				webcomponent: o,
 				context: {
 					...e.context,
 					userSettingsData: s
 				}
-			}, r, void 0, "usersettings");
+			}, i, void 0, "usersettings");
 			return c.addEventListener(V.CUSTOM_MESSAGE, (e) => {
 				let n = e.detail;
-				n?.id === "luigi.updateUserSettings" && (i[t] = n.data?.data ?? n.data);
+				n?.id === "luigi.updateUserSettings" && (a[t] = n.data?.data ?? n.data);
 			}), c;
-		}, e.onCloseCallback = async (e, t) => {
-			let n = {
+		}, e.onCloseCallback = async (e) => {
+			let t = {
 				...e,
-				...i
+				...a
 			};
-			await r.storeUserSettings(n, t);
-		}, r.getEngine()._connector?.openUserSettings(e, t, n);
+			await i.storeUserSettings(t, n);
+		}, i.getEngine()._connector?.openUserSettings(e, t, r);
 	}
 }, Ai = new class {
 	idpProviderInstance;
@@ -9537,8 +9633,7 @@ var fi = {
 			let e = U.getContentViewParamPrefix(this.luigi), t = Object.entries(o).map(([t, n]) => e + encodeURIComponent(t) + "=" + encodeURIComponent(n)).join("&");
 			s += (s.includes("?") ? "&" : "?") + t;
 		}
-		let { nodeParams: c, ...l } = a;
-		this.luigi.getConfigValue("routing.showModalPathInUrl") && this.modalService.getModalStackLength() === 0 && this.routingService.appendModalDataToUrl(s, l), this.luigi.getEngine()._ui.openModal(this.luigi, i, a, n, {
+		this.luigi.getConfigValue("routing.showModalPathInUrl") && this.modalService.getModalStackLength() === 0 && this.routingService.appendModalDataToUrl(s, a), this.luigi.getEngine()._ui.openModal(this.luigi, i, a, n, {
 			nodeParams: o,
 			pathParams: {},
 			searchParams: {}
@@ -9567,6 +9662,10 @@ var fi = {
 		n?.runTimeErrorHandler?.errorFn && a.isFunction(n?.runTimeErrorHandler?.errorFn) ? n.runTimeErrorHandler.errorFn(e, n) : r?.errorFn && a.isFunction(r.errorFn) && r.errorFn(e, n);
 	};
 	pathExists = async (e) => await U.pathExists(e, this.luigi);
+	hasBack = () => this.modalService.getModalStackLength() > 0 || this.navService.getPreservedViewsLength() > 0;
+	goBack = (e) => {
+		this.navService.handleGoBackRequest(e && JSON.stringify(e));
+	};
 	fromVirtualTreeRoot() {
 		return this.options.fromContext = null, this.options.fromClosestContext = !1, this.options.fromVirtualTreeRoot = !0, this.options.fromParent = !1, this;
 	}
@@ -9715,6 +9814,20 @@ var fi = {
 		}
 		return n;
 	}
+	prepareUserSettingsObj(e, t) {
+		let n = {}, r = t || {};
+		return (Array.isArray(e) ? e : []).forEach((e) => {
+			Object.keys(e || {}).forEach((t) => {
+				let i = e[t] || {}, a = {};
+				i.settings && Object.keys(i.settings).forEach((e) => {
+					a[e] = "";
+				}), n[t] = {
+					...a,
+					...r[t] || {}
+				};
+			});
+		}), n;
+	}
 	getUserSettingsIframesInDom() {
 		let e = document.querySelector(".iframeUserSettingsCtn");
 		return e ? [...e.children] : [];
@@ -9779,12 +9892,12 @@ var fi = {
 	openUserSettings = async () => {
 		let e = this.luigi.getConfigValue("userSettings");
 		if (!e) return;
-		let t = this.luigi.getConfigValue("settings"), n = await this.luigi.readUserSettings(), r = Hi.processUserSettingGroups(e, t), i = e.userSettingsDialog || {}, a = i.dialogHeader || hi.userSettingsDialog.dialogHeader, o = i.saveBtn || hi.userSettingsDialog.saveBtn, s = i.dismissBtn || hi.userSettingsDialog.dismissBtn, c = {
-			dialogHeader: this.luigi.i18n().getTranslation(a),
-			saveBtn: this.luigi.i18n().getTranslation(o),
-			dismissBtn: this.luigi.i18n().getTranslation(s)
+		let t = this.luigi.getConfigValue("settings"), n = await this.luigi.readUserSettings(), r = Hi.processUserSettingGroups(e, t), i = Hi.prepareUserSettingsObj(r, n), a = e.userSettingsDialog || {}, o = a.dialogHeader || hi.userSettingsDialog.dialogHeader, s = a.saveBtn || hi.userSettingsDialog.saveBtn, c = a.dismissBtn || hi.userSettingsDialog.dismissBtn, l = {
+			dialogHeader: this.luigi.i18n().getTranslation(o),
+			saveBtn: this.luigi.i18n().getTranslation(s),
+			dismissBtn: this.luigi.i18n().getTranslation(c)
 		};
-		this.luigi.getEngine()._ui?.openUserSettings(c, r, n, this.luigi);
+		this.luigi.getEngine()._ui?.openUserSettings(l, r, n, i, this.luigi);
 	};
 	closeUserSettings = () => {
 		this.luigi.getEngine()._connector?.closeUserSettings();
@@ -11502,6 +11615,8 @@ var sc = {
 		}), e.addEventListener(V.SET_VIEW_GROUP_DATA_REQUEST, (n) => {
 			let r = e.viewGroup;
 			r && oc(r, n.detail, t);
+		}), e.addEventListener(V.GO_BACK_REQUEST, (t) => {
+			e.parentNode?.classList?.contains("content") && W.get(yi).handleGoBackRequest(t.payload);
 		});
 	}
 };