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

[PM-18721] revert submit/disabled handling

Browse Source
This commit is contained in:
rr-bw
2025-05-21 15:05:52 -07:00
parent fc59392d64
commit ed0f198ffe
2 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html
View File

@@ -17,23 +17,8 @@
</div>
<ng-container bitDialogFooter>
<button
class="tw-relative"
type="button"
bitButton
buttonType="primary"
[disabled]="submitting"
(click)="handlePrimaryButtonClick()"
>
<span
[ngClass]="{ 'tw-invisible': !submitting }"
class="tw-absolute tw-inset-0 tw-flex tw-items-center tw-justify-center"
>
<i class="bwi bwi-spinner bwi-lg bwi-spin" aria-hidden="true"></i>
</span>
<span [ngClass]="{ 'tw-invisible': submitting }">
{{ "save" | i18n }}
</span>
<button type="button" bitButton buttonType="primary" (click)="handlePrimaryButtonClick()">
{{ "save" | i18n }}
</button>
<button type="button" bitButton buttonType="secondary" bitDialogClose>
{{ "cancel" | i18n }}

18
apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
View File

@@ -67,8 +67,6 @@ export class EmergencyAccessTakeoverDialogComponent implements OnInit {
inputPasswordFlow = InputPasswordFlow.ChangePasswordDelegation;
masterPasswordPolicyOptions?: MasterPasswordPolicyOptions;
receivedPasswordInputResult = false;
submitting = false;
constructor(
@Inject(DIALOG_DATA) protected dialogData: EmergencyAccessTakeoverDialogData,
@@ -93,24 +91,10 @@ export class EmergencyAccessTakeoverDialogComponent implements OnInit {
}
protected handlePrimaryButtonClick = async () => {
try {
this.submitting = true;
await this.inputPasswordComponent.submit();
} catch {
// Flip to false if submit() throws an error
this.submitting = false;
}
// Flip to false if submit() returns early without a PasswordInputResult
// emission due to form validation errors or new password doesn't meet org policy reqs.
if (!this.receivedPasswordInputResult) {
this.submitting = false;
}
await this.inputPasswordComponent.submit();
};
protected async handlePasswordFormSubmit(passwordInputResult: PasswordInputResult) {
this.receivedPasswordInputResult = Boolean(passwordInputResult);
try {
await this.emergencyAccessService.takeover(
this.dialogData.emergencyAccessId,