Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,10 @@
protected rowHeight = 69;
protected rowHeightClass = `tw-h-[69px]`;

private organizationUsersCount = 0;

Check warning on line 113 in apps/web/src/app/admin-console/organizations/members/members.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/admin-console/organizations/members/members.component.ts#L113

Added line #L113 was not covered by tests

get occupiedSeatCount(): number {
return this.dataSource.activeUserCount;
return this.organizationUsersCount;

Check warning on line 116 in apps/web/src/app/admin-console/organizations/members/members.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/admin-console/organizations/members/members.component.ts#L116

Added line #L116 was not covered by tests
}

constructor(
Expand Down Expand Up @@ -218,6 +220,7 @@
);

this.orgIsOnSecretsManagerStandalone = billingMetadata.isOnSecretsManagerStandalone;
this.organizationUsersCount = billingMetadata.organizationOccupiedSeats;

Check warning on line 223 in apps/web/src/app/admin-console/organizations/members/members.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/admin-console/organizations/members/members.component.ts#L223

Added line #L223 was not covered by tests

await this.load();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
invoiceCreatedDate: Date | null;
subPeriodEndDate: Date | null;
isSubscriptionCanceled: boolean;
organizationOccupiedSeats: number;

constructor(response: any) {
super(response);
Expand All @@ -25,6 +26,7 @@
this.invoiceCreatedDate = this.parseDate(this.getResponseProperty("InvoiceCreatedDate"));
this.subPeriodEndDate = this.parseDate(this.getResponseProperty("SubPeriodEndDate"));
this.isSubscriptionCanceled = this.getResponseProperty("IsSubscriptionCanceled");
this.organizationOccupiedSeats = this.getResponseProperty("OrganizationOccupiedSeats");

Check warning on line 29 in libs/common/src/billing/models/response/organization-billing-metadata.response.ts

View check run for this annotation

Codecov / codecov/patch

libs/common/src/billing/models/response/organization-billing-metadata.response.ts#L29

Added line #L29 was not covered by tests
}

private parseDate(dateString: any): Date | null {
Expand Down
Loading