@resolveio/client-lib-core 1.3.0 → 1.3.2
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.
- package/esm2020/lib/auth/auth-guard.service.mjs +3 -3
- package/esm2020/lib/models/permission.model.mjs +1 -1
- package/esm2020/lib/widgets/navbar-module/navbar-module.component.mjs +10 -4
- package/fesm2015/resolveio-client-lib-core.mjs +11 -5
- package/fesm2015/resolveio-client-lib-core.mjs.map +1 -1
- package/fesm2020/resolveio-client-lib-core.mjs +11 -5
- package/fesm2020/resolveio-client-lib-core.mjs.map +1 -1
- package/lib/models/permission.model.d.ts +0 -1
- package/package.json +1 -1
|
@@ -4803,16 +4803,22 @@ class NavbarModuleComponent extends BaseComponent {
|
|
|
4803
4803
|
this.routerEvents$.push(this._services._router.events
|
|
4804
4804
|
//.filter(event => event instanceof NavigationEnd)
|
|
4805
4805
|
.subscribe((event) => {
|
|
4806
|
-
this.
|
|
4806
|
+
if (this._services._router.url.replace(/\/[a-f0-9]{24}$/, '').replace(/\?.+$/, '') !== this.currentRoute || !this.selectedTab) {
|
|
4807
|
+
this.selectTabFromRouter();
|
|
4808
|
+
}
|
|
4807
4809
|
}));
|
|
4808
4810
|
this.routerEvents$.push(this._services._router.events
|
|
4809
4811
|
//.filter(event => event instanceof NavigationCancel)
|
|
4810
4812
|
.subscribe((event) => {
|
|
4811
|
-
this.
|
|
4813
|
+
if (this._services._router.url.replace(/\/[a-f0-9]{24}$/, '').replace(/\?.+$/, '') !== this.currentRoute || !this.selectedTab) {
|
|
4814
|
+
this.selectTabFromRouter();
|
|
4815
|
+
}
|
|
4812
4816
|
}));
|
|
4813
4817
|
this.routerEvents$.push(this._services._app.navbarModuleData.subscribe(data => {
|
|
4814
4818
|
this.menuData = data;
|
|
4815
|
-
this.
|
|
4819
|
+
if (this._services._router.url.replace(/\/[a-f0-9]{24}$/, '').replace(/\?.+$/, '') !== this.currentRoute || !this.selectedTab) {
|
|
4820
|
+
this.selectTabFromRouter();
|
|
4821
|
+
}
|
|
4816
4822
|
}));
|
|
4817
4823
|
this.routerEvents$.push(this._services._app.tourStarted.subscribe(tourStarted => {
|
|
4818
4824
|
this.tourStarted = tourStarted;
|
|
@@ -5657,11 +5663,11 @@ class AuthGuard {
|
|
|
5657
5663
|
for (let j = 0; j < permission.views.length; j++) {
|
|
5658
5664
|
let view = permission.views[j];
|
|
5659
5665
|
if (view.link === link) {
|
|
5660
|
-
return
|
|
5666
|
+
return false;
|
|
5661
5667
|
}
|
|
5662
5668
|
}
|
|
5663
5669
|
}
|
|
5664
|
-
return
|
|
5670
|
+
return true;
|
|
5665
5671
|
}
|
|
5666
5672
|
isLinkPartialRoute(link) {
|
|
5667
5673
|
let permissions = this._aps.getAllModulePermissions();
|