@nettyapps/ntybase 0.1.17 → 0.1.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -546,7 +546,9 @@ class CommonService {
|
|
|
546
546
|
const currentUrl = this.router.parseUrl(this.router.url);
|
|
547
547
|
const primaryOutlet = currentUrl.root.children['primary'];
|
|
548
548
|
const rightSidenavOutlet = currentUrl.root.children['rightSidenav'];
|
|
549
|
-
if (rightSidenavOutlet
|
|
549
|
+
if (rightSidenavOutlet ||
|
|
550
|
+
currentUrl.queryParams['parameters'] ||
|
|
551
|
+
currentUrl.queryParams['type']) {
|
|
550
552
|
this.router.navigate([
|
|
551
553
|
{
|
|
552
554
|
outlets: {
|
|
@@ -555,7 +557,8 @@ class CommonService {
|
|
|
555
557
|
},
|
|
556
558
|
},
|
|
557
559
|
], {
|
|
558
|
-
|
|
560
|
+
queryParams: {},
|
|
561
|
+
queryParamsHandling: '',
|
|
559
562
|
replaceUrl: true,
|
|
560
563
|
});
|
|
561
564
|
}
|
|
@@ -1246,11 +1249,11 @@ class NettyAgGridBase {
|
|
|
1246
1249
|
sysFunctionProxy = inject(SysfunctionProxy);
|
|
1247
1250
|
environment = inject(EnvironmentProxy);
|
|
1248
1251
|
// Parse query parameters
|
|
1249
|
-
queryParameterGUID = toSignal(this.routerActive.queryParamMap.pipe(map(params => params.get('parameters')), map(value => this.parseOrReturnValue(value))), {
|
|
1250
|
-
initialValue: null // set initial value to null
|
|
1252
|
+
queryParameterGUID = toSignal(this.routerActive.queryParamMap.pipe(map((params) => params.get('parameters')), map((value) => this.parseOrReturnValue(value))), {
|
|
1253
|
+
initialValue: null, // set initial value to null
|
|
1251
1254
|
});
|
|
1252
|
-
queryParameterType = toSignal(this.routerActive.queryParamMap.pipe(map(params => params.get('type')), map(value => this.parseOrReturnValue(value))), {
|
|
1253
|
-
initialValue: null // set initial value to null
|
|
1255
|
+
queryParameterType = toSignal(this.routerActive.queryParamMap.pipe(map((params) => params.get('type')), map((value) => this.parseOrReturnValue(value))), {
|
|
1256
|
+
initialValue: null, // set initial value to null
|
|
1254
1257
|
});
|
|
1255
1258
|
// Query Parameters can be provide as parameters
|
|
1256
1259
|
parameterGUID = signal('', ...(ngDevMode ? [{ debugName: "parameterGUID" }] : []));
|
|
@@ -1914,7 +1917,7 @@ class NettyAgGridSaveBase {
|
|
|
1914
1917
|
this.dialogRef.close('saved');
|
|
1915
1918
|
}
|
|
1916
1919
|
else if (this.viewMode() === 'sidenav') {
|
|
1917
|
-
this.
|
|
1920
|
+
this.commonService.clearOutlet();
|
|
1918
1921
|
}
|
|
1919
1922
|
else {
|
|
1920
1923
|
const cleanPath = this.commonService.getCleanUrlPath();
|
|
@@ -2808,11 +2811,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.11", ngImpo
|
|
|
2808
2811
|
class NettyMenuService {
|
|
2809
2812
|
http = inject(HttpClient);
|
|
2810
2813
|
environmentProxy = inject(EnvironmentProxy);
|
|
2814
|
+
i18nService = inject(I18nService);
|
|
2811
2815
|
menuName = signal('', ...(ngDevMode ? [{ debugName: "menuName" }] : []));
|
|
2812
2816
|
menu = signal(null, ...(ngDevMode ? [{ debugName: "menu" }] : []));
|
|
2813
2817
|
constructor() {
|
|
2814
2818
|
effect(() => {
|
|
2815
2819
|
const currentMenuName = this.menuName();
|
|
2820
|
+
const currentLang = this.i18nService.currentLang();
|
|
2816
2821
|
if (!currentMenuName.trim()) {
|
|
2817
2822
|
return;
|
|
2818
2823
|
}
|
|
@@ -3167,14 +3172,9 @@ class Toolbar {
|
|
|
3167
3172
|
}
|
|
3168
3173
|
setLanguage(language) {
|
|
3169
3174
|
this.i18nService.language = language;
|
|
3170
|
-
setTimeout(() => {
|
|
3171
|
-
this.router.navigateByUrl('/', { skipLocationChange: true }).then(() => {
|
|
3172
|
-
this.router.navigate([window.location.pathname]);
|
|
3173
|
-
});
|
|
3174
|
-
}, 500);
|
|
3175
3175
|
setTimeout(() => {
|
|
3176
3176
|
window.location.reload();
|
|
3177
|
-
},
|
|
3177
|
+
}, 100);
|
|
3178
3178
|
}
|
|
3179
3179
|
getCurrentLanguageIcon() {
|
|
3180
3180
|
switch (this.i18nService.language) {
|