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

[PM-21109] Resend invitation button not responsive when clicked (#14603)

Browse Source 
* Resolve the resend email bug

* Resolve the resend invite option for Active sponsorship

* Resolve the lint error

* Rename the o variable  properly
This commit is contained in:
cyprain-okeke
2025-05-05 16:19:11 +01:00
committed by GitHub
parent af40ff26a2
commit 28f00e5533
7 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/web/src/app/billing/members/free-bitwarden-families.component.html
View File

@@ -39,12 +39,14 @@
</tr>
</ng-container>
<ng-template body alignContent="middle">
@for (o of sponsoredFamilies; let i = $index; track i) {
@for (sponsoredFamily of sponsoredFamilies; let i = $index; track i) {
<ng-container>
<tr bitRow>
<td bitCell>{{ o.friendlyName }}</td>
<td bitCell [class]="o.statusClass">{{ o.statusMessage }}</td>
<td bitCell>{{ o.notes }}</td>
<td bitCell>{{ sponsoredFamily.friendlyName }}</td>
<td bitCell [class]="sponsoredFamily.statusClass">
{{ sponsoredFamily.statusMessage }}
</td>
<td bitCell>{{ sponsoredFamily.notes }}</td>
<td bitCell>
<button
type="button"
@@ -58,7 +60,8 @@
type="button"
bitMenuItem
[attr.aria-label]="'resendEmailLabel' | i18n"
(click)="resendEmail(o)"
*ngIf="!isSelfHosted && !sponsoredFamily.validUntil"
(click)="resendEmail(sponsoredFamily)"
>
<i aria-hidden="true" class="bwi bwi-envelope"></i>
{{ "resendInvitation" | i18n }}
@@ -70,7 +73,7 @@
type="button"
bitMenuItem
[attr.aria-label]="'revokeAccountMessage' | i18n"
(click)="removeSponsorship(o)"
(click)="removeSponsorship(sponsoredFamily)"
>
<i aria-hidden="true" class="bwi bwi-close tw-text-danger"></i>
<span class="tw-text-danger pl-1">{{ "remove" | i18n }}</span>

5
apps/web/src/app/billing/members/free-bitwarden-families.component.ts
View File

@@ -145,7 +145,10 @@ export class FreeBitwardenFamiliesComponent implements OnInit {
}
async resendEmail(sponsorship: OrganizationSponsorshipInvitesResponse) {
await this.apiService.postResendSponsorshipOffer(sponsorship.sponsoringOrganizationUserId);
await this.organizationSponsorshipApiService.postResendSponsorshipOffer(
this.organizationId,
sponsorship.friendlyName,
);
this.toastService.showToast({
variant: "success",
title: undefined,

7
apps/web/src/app/billing/settings/sponsoring-org-row.component.ts
View File

@@ -10,6 +10,7 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { OrganizationSponsorshipApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/organizations/organization-sponsorship-api.service.abstraction";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { DialogService, ToastService } from "@bitwarden/components";
@@ -37,6 +38,7 @@ export class SponsoringOrgRowComponent implements OnInit {
private toastService: ToastService,
private policyService: PolicyService,
private accountService: AccountService,
private organizationSponsorshipApiService: OrganizationSponsorshipApiServiceAbstraction,
) {}
async ngOnInit() {
@@ -73,7 +75,10 @@ export class SponsoringOrgRowComponent implements OnInit {
}
async resendEmail() {
await this.apiService.postResendSponsorshipOffer(this.sponsoringOrg.id);
await this.organizationSponsorshipApiService.postResendSponsorshipOffer(
this.sponsoringOrg.id,
this.sponsoringOrg.familySponsorshipFriendlyName,
);
this.toastService.showToast({
variant: "success",
title: null,