bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-11 13:53:34 +00:00
Code Issues Releases Wiki Activity

[PM-21603]Invite Member sub text seat count does not account for sponsorships (#14954)

Browse Source 
* Resolve the membership count

* Get the occupied Seat count from metadata
This commit is contained in:
cyprain-okeke
2025-05-29 15:06:07 +01:00
committed by GitHub
parent c48e4be14b
commit 0715597e8e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/web/src/app/admin-console/organizations/members/members.component.ts
View File

@@ -110,8 +110,10 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
protected rowHeight = 69; protected rowHeight = 69;
protected rowHeightClass = `tw-h-[69px]`; protected rowHeightClass = `tw-h-[69px]`;
private organizationUsersCount = 0;
get occupiedSeatCount(): number { get occupiedSeatCount(): number {
return this.dataSource.activeUserCount; return this.organizationUsersCount;
} }
constructor( constructor(
@@ -218,6 +220,7 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
); );
this.orgIsOnSecretsManagerStandalone = billingMetadata.isOnSecretsManagerStandalone; this.orgIsOnSecretsManagerStandalone = billingMetadata.isOnSecretsManagerStandalone;
this.organizationUsersCount = billingMetadata.organizationOccupiedSeats;
await this.load(); await this.load();

2
libs/common/src/billing/models/response/organization-billing-metadata.response.ts
View File

@@ -11,6 +11,7 @@ export class OrganizationBillingMetadataResponse extends BaseResponse {
invoiceCreatedDate: Date | null; invoiceCreatedDate: Date | null;
subPeriodEndDate: Date | null; subPeriodEndDate: Date | null;
isSubscriptionCanceled: boolean; isSubscriptionCanceled: boolean;
organizationOccupiedSeats: number;
constructor(response: any) { constructor(response: any) {
super(response); super(response);
@@ -25,6 +26,7 @@ export class OrganizationBillingMetadataResponse extends BaseResponse {
this.invoiceCreatedDate = this.parseDate(this.getResponseProperty("InvoiceCreatedDate")); this.invoiceCreatedDate = this.parseDate(this.getResponseProperty("InvoiceCreatedDate"));
this.subPeriodEndDate = this.parseDate(this.getResponseProperty("SubPeriodEndDate")); this.subPeriodEndDate = this.parseDate(this.getResponseProperty("SubPeriodEndDate"));
this.isSubscriptionCanceled = this.getResponseProperty("IsSubscriptionCanceled"); this.isSubscriptionCanceled = this.getResponseProperty("IsSubscriptionCanceled");
this.organizationOccupiedSeats = this.getResponseProperty("OrganizationOccupiedSeats");
} }
private parseDate(dateString: any): Date | null { private parseDate(dateString: any): Date | null {