bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 16:23:44 +00:00
Code Issues Releases Wiki Activity

[PM-24305] Only enable the cipher form when it is disabled (#16259)

Browse Source 
* only enable the cipher form when it is disabled

* switch to tracking the last emitted state for disabled rather than the form status.

The form status can be changed if any child control changes
This commit is contained in:
Nick Krantz
2025-09-17 13:58:46 -05:00
committed by GitHub
parent caf4ca6980
commit 200fc71c5c
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libs/vault/src/cipher-form/components/cipher-form.component.spec.ts
View File

@@ -122,4 +122,33 @@ describe("CipherFormComponent", () => {
expect(component["updatedCipherView"]?.login.fido2Credentials).toBeNull();
});
});
describe("enableFormFields", () => {
beforeEach(() => {
// disable the form so enabling occurs
component.disableFormFields();
});
it("only enables the form when it is disabled", () => {
jest.spyOn(component["cipherForm"], "enable");
component.enableFormFields();
expect(component["cipherForm"].enable).toHaveBeenCalled();
component.enableFormFields();
component.enableFormFields();
// enable is only called once
expect(component["cipherForm"].enable).toHaveBeenCalledTimes(1);
});
it("emits formStatusChange$", (done) => {
component.formStatusChange$.subscribe((status) => {
expect(status).toBe("enabled");
done();
});
component.enableFormFields();
});
});
});

16
libs/vault/src/cipher-form/components/cipher-form.component.ts
View File

@@ -17,7 +17,7 @@ import {
} from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms";
import { Subject } from "rxjs";
import { BehaviorSubject, Subject } from "rxjs";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { CipherType, SecureNoteType } from "@bitwarden/common/vault/enums";
@@ -115,7 +115,7 @@ export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, Ci
/**
* Emitted when the form is enabled
*/
private formStatusChangeSubject = new Subject<"enabled" | "disabled">();
private formStatusChangeSubject = new BehaviorSubject<"enabled" | "disabled" | null>(null);
@Output() formStatusChange$ = this.formStatusChangeSubject.asObservable();
/**
@@ -161,9 +161,17 @@ export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, Ci
this.formStatusChangeSubject.next("disabled");
}
/**
* Enables the form, only when it is currently disabled.
* Child forms could have disabled some of their controls based on
* other factors. Enabling the form from this level should only occur
* when the form was disabled at this level.
*/
enableFormFields(): void {
this.cipherForm.enable({ emitEvent: false });
this.formStatusChangeSubject.next("enabled");
if (this.formStatusChangeSubject.getValue() === "disabled") {
this.cipherForm.enable({ emitEvent: false });
this.formStatusChangeSubject.next("enabled");
}
}
/**