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

package/luigi-engine.d.ts

@@ -17,7 +17,7 @@ export declare class LuigiEngine {
         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>;
+        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;
 	},
@@ -8708,7 +8717,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 +8765,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;
@@ -9059,29 +9072,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 +9550,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: {}
@@ -9715,6 +9727,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 +9805,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();