andwati/zitadel
1
0
Fork 0
mirror of https://github.com/andwati/zitadel.git synced 2026-10-31 03:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(console): routing on org change (#4369)

Browse Source 
fix: console routing on org change

Co-authored-by: Silvan <[email protected]>
Co-authored-by: Fabi <[email protected]>
This commit is contained in:
Max Peintner
2022-09-19 11:50:34 +02:00
committed by GitHub
co-authored by Silvan Fabi
parent ef87a53dfc
commit 49396c4678
4 changed files with 7 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
console/src/app/app.component.ts
+1 -18
View File
@@ -184,20 +184,6 @@ export class AppComponent implements OnDestroy {
this.domSanitizer.bypassSecurityTrustResourceUrl('assets/mdi/arrow-decision-outline.svg'),
);
this.activatedRoute.queryParams.pipe(takeUntil(this.destroy$)).subscribe((route) => {
const { org } = route;
if (org) {
this.authService
.getActiveOrg(org)
.then((queriedOrg) => {
this.org = queriedOrg;
})
.catch((error) => {
this.router.navigate(['/users/me']);
});
}
});
this.getProjectCount();
this.authService.activeOrgChanged.pipe(takeUntil(this.destroy$)).subscribe((org) => {
@@ -265,9 +251,7 @@ export class AppComponent implements OnDestroy {
public changedOrg(org: Org.AsObject): void {
this.themeService.loadPrivateLabelling();
this.authService.zitadelPermissions$.pipe(take(1)).subscribe(() => {
this.router.navigate(['/org'], { fragment: org.id });
});
this.router.navigate(['/org']);
}
private setLanguage(): void {
@@ -276,7 +260,6 @@ export class AppComponent implements OnDestroy {
this.authService.user.subscribe((userprofile) => {
if (userprofile) {
// this.user = userprofile;
const cropped = navigator.language.split('-')[0] ?? 'en';
const fallbackLang = cropped.match(/en|de|it|zh/) ? cropped : 'en';