@luigi-project/core-modular 0.0.12 → 0.0.13-dev.202608110030

package/luigi.js

@@ -7953,75 +7953,79 @@ var fi = {
 		}), n;
 	}
 	async buildNavItems(e, t, n) {
-		let r = {}, i = [], a = [];
-		for (let o of e) {
-			if (!H.isNodeAccessPermitted(o, this.getParentNode(n.selectedNode, n), n?.selectedNode?.context || {}, this.luigi)) continue;
-			let e = !!o.badgeCounter, s = o.externalLink ? { ...o.externalLink } : void 0, c = U.getNodeHref(o, n?.pathParams, this.luigi), l = 0;
-			if (o.badgeCounter && (l = await o.badgeCounter.count()), s?.url) {
-				let e = { ...o };
+		let r = {}, i = [], a = [], o = [];
+		for (let s of e) {
+			if (!H.isNodeAccessPermitted(s, this.getParentNode(n.selectedNode, n), n?.selectedNode?.context || {}, this.luigi)) continue;
+			let e = !!s.badgeCounter, c = s.externalLink ? { ...s.externalLink } : void 0, l = U.getNodeHref(s, n?.pathParams, this.luigi), u = 0;
+			if (s.badgeCounter && (u = await s.badgeCounter.count()), c?.url) {
+				let e = { ...s };
 				t?.context && (e.context = {
 					...e.context,
 					...t.context
 				});
 				let r = {
 					...e,
-					viewUrl: s.url
+					viewUrl: c.url
 				}, i = n?.pathParams ? n.pathParams : {};
-				s.url = U.substituteViewUrl(r, i, void 0, this.luigi), c = s.url;
+				c.url = U.substituteViewUrl(r, i, void 0, this.luigi), l = c.url;
 			}
-			if (o.category) {
-				let n = o.category.id || o.category.label || o.category, a = this.luigi.i18n().getTranslation(o.category.label || o.category.id || o.category), u = r[n];
-				if (!u) u = {
+			let d = s.category && (typeof s.category == "string" || s.category.id || s.category.label);
+			if (d) {
+				let n = s.category.id || s.category.label || s.category, a = this.luigi.i18n().getTranslation(s.category.label || s.category.id || s.category), o = r[n];
+				if (!o) o = {
 					badgeCounter: e ? {
-						count: () => Number(l),
+						count: () => Number(u),
 						label: ""
 					} : void 0,
 					category: {
-						altText: o.category.altText || "",
-						icon: o.category.icon,
+						altText: s.category.altText || "",
+						icon: s.category.icon,
 						id: n,
 						label: a,
 						nodes: [],
-						tooltip: this.resolveTooltipText(o.category, a)
+						tooltip: this.resolveTooltipText(s.category, a)
 					}
-				}, r[n] = u, i.push(u);
-				else if (e) if (u.badgeCounter) {
-					let e = await u.badgeCounter.count();
-					u.badgeCounter.count = () => Number(e + l);
-				} else u.badgeCounter = {
-					count: () => Number(l),
+				}, r[n] = o, i.push(o);
+				else if (e) if (o.badgeCounter) {
+					let e = await o.badgeCounter.count();
+					o.badgeCounter.count = () => Number(e + u);
+				} else o.badgeCounter = {
+					count: () => Number(u),
 					label: ""
 				};
-				u.category?.nodes?.push({
-					altText: o.altText,
-					externalLink: s,
-					href: c,
-					icon: o.icon,
-					label: o.label ? U.resolveNodeLabel(o, this.luigi) : void 0,
-					node: o,
-					selected: o === t,
-					tooltip: o.label ? this.resolveTooltipText(o, o.label) : void 0
+				o.category?.nodes?.push({
+					altText: s.altText,
+					externalLink: c,
+					href: l,
+					icon: s.icon,
+					label: s.label ? U.resolveNodeLabel(s, this.luigi) : void 0,
+					node: s,
+					selected: s === t,
+					tooltip: s.label ? this.resolveTooltipText(s, s.label) : void 0
 				});
-			} else i.push({
-				altText: o.altText,
-				badgeCounter: o.badgeCounter,
-				externalLink: s,
-				href: c,
-				icon: o.icon,
-				label: o.label ? U.resolveNodeLabel(o, this.luigi) : void 0,
-				node: o,
-				selected: o === t,
-				tooltip: o.label ? this.resolveTooltipText(o, o.label) : void 0
-			});
-			l && a.push(l);
+			} else {
+				let e = {
+					altText: s.altText,
+					badgeCounter: s.badgeCounter,
+					externalLink: c,
+					href: l,
+					icon: s.icon,
+					label: s.label ? U.resolveNodeLabel(s, this.luigi) : void 0,
+					node: s,
+					selected: s === t,
+					tooltip: s.label ? this.resolveTooltipText(s, s.label) : void 0
+				};
+				s.category && !d ? a.push(e) : i.push(e);
+			}
+			u && o.push(u);
 		}
-		let o = a?.length ? a.reduce((e, t) => e + t) : 0;
-		return {
+		let s = o?.length ? o.reduce((e, t) => e + t) : 0, c = {
+			count: () => s,
+			label: ""
+		};
+		return i.unshift(...a), {
 			items: i,
-			totalBadgeNode: {
-				count: () => o,
-				label: ""
-			}
+			totalBadgeNode: c
 		};
 	}
 	async getCurrentNode(e) {
@@ -8380,12 +8384,14 @@ var fi = {
 				return;
 			}
 			let n = this.luigi.getConfigValue("routing.disableBrowserHistory") ? "replaceState" : y;
-			if (p) if (!l && n !== "replaceState") location.hash = v;
-			else {
-				let t = new CustomEvent("hashchange", e);
-				window.history[n]({ path: "/#" + v }, "", "/#" + v), window.dispatchEvent(t);
-			}
-			else {
+			if (p) {
+				let t = a.addLeadingSlash(v);
+				if (!l && n !== "replaceState") location.hash = t;
+				else {
+					let r = new CustomEvent("hashchange", e);
+					window.history[n]({ path: "/#" + t }, "", "/#" + t), window.dispatchEvent(r);
+				}
+			} else {
 				let t = new CustomEvent("popstate", e);
 				window.history[n]({ path: v }, "", v), window.dispatchEvent(t);
 			}
@@ -8904,16 +8910,21 @@ var fi = {
 		t.getEngine()._connector?.hideLoadingIndicator(c);
 		let l = n?.nodeParams || {}, u = n?.pathParams || {}, d = n?.searchParams || {};
 		if (e && c) {
-			let o, f;
-			(e.virtualTree || e._virtualTree) && (f = H.findVirtualTreeRootNode(e));
-			let p = e.viewUrl ? W.get(Ci).applyDecorators(U.substituteViewUrl(e, u, l, t), e.decodeViewUrl ?? !1) : "";
+			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 (n.viewGroup && e.viewGroup !== n.viewGroup) {
-					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 n.viewGroup || n.virtualTree && f === n.virtualTreeRootNode || !e.viewGroup && !e.isolateView && !e.webcomponent && n.viewurl && p && a.isSameUrl(n.viewurl, p) ? o = n : n.remove();
-			}), o && o._luigiPreloading && (o._luigiPreloading = !1, W.get(bi).viewGroupLoaded(o)), o) r || (o.style.display = "block", o.viewurl = p, o.nodeParams = l, o.pathParams = u, o.clientPermissions = e.clientPermissions, o.searchParams = d, o.locale = t.i18n().getCurrentLocale(), o.theme = t.theming().getCurrentTheme(), o.activeFeatureToggleList = t.featureToggles().getActiveFeatureToggleList(), o.userSettingsGroup = e.userSettingsGroup, o.userSettings = s, Ti(o, t), Ei(o, t)), i || o.updateContext(e.context || {}, { withoutSync: !1 });
+				if (n.tagName?.indexOf("LUIGI-") === 0) if (r && (o = 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 n.viewGroup || n.virtualTree && p === n.virtualTreeRootNode || !e.viewGroup && !e.isolateView && !e.webcomponent && n.viewurl && 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 || (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)), i || (a.isSameUrl(n, m) && n !== m && !f.virtualTree ? (f.context = e.context || {}, f.updateViewUrl(m)) : f.updateContext(e.context || {}, { withoutSync: !1 }));
+			} else if (r) !i && o && o.updateContext(e.context || {}, { withoutSync: r });
 			else {
 				let r = await wi(e, t, n, "main");
 				c?.appendChild(r);