bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 22:33:35 +00:00
Code Issues Releases Wiki Activity

[SM-1365] Fix organization ID not updating on overview swaps (#10189)

Browse Source 
* fix org id not being updated in new-menu on org swaps

* fix org suspended component
This commit is contained in:
Thomas Avery
2024-07-26 16:06:48 -05:00
committed by GitHub
parent a437868727
commit d4a1c1a997
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts
View File

@@ -1,6 +1,6 @@
import { Component, OnDestroy, OnInit } from "@angular/core"; import { Component, OnDestroy, OnInit } from "@angular/core";
import { ActivatedRoute } from "@angular/router"; import { ActivatedRoute } from "@angular/router";
import { Subject, takeUntil, concatMap, map } from "rxjs"; import { Subject, takeUntil, concatMap } from "rxjs";
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { DialogService } from "@bitwarden/components"; import { DialogService } from "@bitwarden/components";
@@ -36,16 +36,12 @@ export class NewMenuComponent implements OnInit, OnDestroy {
ngOnInit() { ngOnInit() {
this.route.params this.route.params
.pipe( .pipe(
concatMap((params) => concatMap(async (params) => await this.organizationService.get(params.organizationId)),
this.organizationService
.get$(params.organizationId)
.pipe(map((organization) => ({ params, organization }))),
),
takeUntil(this.destroy$), takeUntil(this.destroy$),
) )
.subscribe((mapResult) => { .subscribe((org) => {
this.organizationId = mapResult?.params?.organizationId; this.organizationId = org.id;
this.organizationEnabled = mapResult?.organization?.enabled; this.organizationEnabled = org.enabled;
}); });
} }

2
bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
View File

@@ -16,7 +16,7 @@ export class OrgSuspendedComponent {
protected NoAccess: Icon = Icons.NoAccess; protected NoAccess: Icon = Icons.NoAccess;
protected organizationName$ = this.route.params.pipe( protected organizationName$ = this.route.params.pipe(
concatMap((params) => this.organizationService.get$(params.organizationId)), concatMap(async (params) => await this.organizationService.get(params.organizationId)),
map((org) => org?.name), map((org) => org?.name),
); );
} }