Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-02-14 01:01:31 +01:00
Code Issues Projects Releases Wiki Activity

[PM-15520] Move organizationPaymentStatus$ out of page setup flow and tweak it to avoid hanging when user is not an owner (#12224)

Browse Source
This commit is contained in:
Shane Melton 2024-12-03 11:25:02 -08:00 committed by GitHub
parent 694f2c7da2
commit 2e53a645c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web/src/app/vault/individual-vault/vault.component.html
View File

@ -1,4 +1,6 @@
<app-vault-banners [organizationsPaymentStatus]="organizationsPaymentStatus"></app-vault-banners> <app-vault-banners
[organizationsPaymentStatus]="organizationsPaymentStatus$ | async"
></app-vault-banners>
<app-vault-header <app-vault-header
[filter]="filter" [filter]="filter"

65
apps/web/src/app/vault/individual-vault/vault.component.ts
View File

@ -181,7 +181,6 @@ export class VaultComponent implements OnInit, OnDestroy {
protected canCreateCollections = false; protected canCreateCollections = false;
protected currentSearchText$: Observable<string>; protected currentSearchText$: Observable<string>;
private activeUserId: UserId; private activeUserId: UserId;
protected organizationsPaymentStatus: FreeTrial[] = [];
private searchText$ = new Subject<string>(); private searchText$ = new Subject<string>();
private refresh$ = new BehaviorSubject<void>(null); private refresh$ = new BehaviorSubject<void>(null);
private destroy$ = new Subject<void>(); private destroy$ = new Subject<void>();
@ -209,6 +208,37 @@ export class VaultComponent implements OnInit, OnDestroy {
), ),
); );
protected organizationsPaymentStatus$: Observable<FreeTrial[]> = combineLatest([
this.organizationService.organizations$.pipe(
map((organizations) => organizations?.filter((org) => org.isOwner) ?? []),
),
this.hasSubscription$,
]).pipe(
switchMap(([ownerOrgs, hasSubscription]) => {
if (!ownerOrgs || ownerOrgs.length === 0 || !hasSubscription) {
return of([]);
}
return combineLatest(
ownerOrgs.map((org) =>
combineLatest([
this.organizationApiService.getSubscription(org.id),
this.organizationBillingService.getPaymentSource(org.id),
]).pipe(
map(([subscription, paymentSource]) => {
return this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
org,
subscription,
paymentSource,
);
}),
),
),
);
}),
map((results) => results.filter((result) => result.shownBanner)),
shareReplay({ refCount: false, bufferSize: 1 }),
);
constructor( constructor(
private syncService: SyncService, private syncService: SyncService,
private route: ActivatedRoute, private route: ActivatedRoute,
@ -425,36 +455,6 @@ export class VaultComponent implements OnInit, OnDestroy {
this.unpaidSubscriptionDialog$.pipe(takeUntil(this.destroy$)).subscribe(); this.unpaidSubscriptionDialog$.pipe(takeUntil(this.destroy$)).subscribe();
const organizationsPaymentStatus$ = combineLatest([
this.organizationService.organizations$,
this.hasSubscription$,
]).pipe(
switchMap(([allOrganizations, hasSubscription]) => {
if (!allOrganizations || allOrganizations.length === 0 || !hasSubscription) {
return of([]);
}
return combineLatest(
allOrganizations
.filter((org) => org.isOwner && hasSubscription)
.map((org) =>
combineLatest([
this.organizationApiService.getSubscription(org.id),
this.organizationBillingService.getPaymentSource(org.id),
]).pipe(
map(([subscription, paymentSource]) => {
return this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
org,
subscription,
paymentSource,
);
}),
),
),
);
}),
map((results) => results.filter((result) => result.shownBanner)),
);
firstSetup$ firstSetup$
.pipe( .pipe(
switchMap(() => this.refresh$), switchMap(() => this.refresh$),
@ -468,7 +468,6 @@ export class VaultComponent implements OnInit, OnDestroy {
ciphers$, ciphers$,
collections$, collections$,
selectedCollection$, selectedCollection$,
organizationsPaymentStatus$,
]), ]),
), ),
takeUntil(this.destroy$), takeUntil(this.destroy$),
@ -482,7 +481,6 @@ export class VaultComponent implements OnInit, OnDestroy {
ciphers, ciphers,
collections, collections,
selectedCollection, selectedCollection,
organizationsPaymentStatus,
]) => { ]) => {
this.filter = filter; this.filter = filter;
this.canAccessPremium = canAccessPremium; this.canAccessPremium = canAccessPremium;
@ -498,7 +496,6 @@ export class VaultComponent implements OnInit, OnDestroy {
this.showBulkMove = filter.type !== "trash"; this.showBulkMove = filter.type !== "trash";
this.isEmpty = collections?.length === 0 && ciphers?.length === 0; this.isEmpty = collections?.length === 0 && ciphers?.length === 0;
this.organizationsPaymentStatus = organizationsPaymentStatus;
this.performingInitialLoad = false; this.performingInitialLoad = false;
this.refreshing = false; this.refreshing = false;
}, },